From 8dad00959e9a6ca3a8caece57274abaef4bbecac Mon Sep 17 00:00:00 2001 From: Doubleumc Date: Tue, 21 Nov 2023 20:55:21 -0500 Subject: [PATCH 1/2] initial --- code/game/machinery/doors/multi_tile.dm | 11 +++++++++++ icons/obj/structures/doors/dropship1_side2.dmi | Bin 0 -> 2553 bytes icons/obj/structures/doors/dropship2_side2.dmi | Bin 0 -> 2116 bytes maps/shuttles/dropship_alamo.dmm | 8 ++++---- maps/shuttles/dropship_normandy.dmm | 8 ++++---- 5 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 icons/obj/structures/doors/dropship1_side2.dmi create mode 100644 icons/obj/structures/doors/dropship2_side2.dmi diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm index ca218128160d..0a179af27803 100644 --- a/code/game/machinery/doors/multi_tile.dm +++ b/code/game/machinery/doors/multi_tile.dm @@ -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' diff --git a/icons/obj/structures/doors/dropship1_side2.dmi b/icons/obj/structures/doors/dropship1_side2.dmi new file mode 100644 index 0000000000000000000000000000000000000000..f2d96e59af5a864e0995e706672a99a6a23c12c8 GIT binary patch literal 2553 zcmX|C3p~^78=swAP6)Y-bCC3DE@4KPB$u|3O+-26dYn**xy>zOE+eKmeRjoeY%b_J>gx`@8Fp>DU^rsTn$sIb>kNP* zvTwB`jL#dtH$I!JYAoL{cc=G`n}(~-Q7fwUDRV6r(fElr+)T08 z6zN*(lUq`BwT}`;NQlT!T*;>5!aF7I4rNcww+AMw+j9|x8cF#a zh`*@26$D%P1E^UoM5VrIe>Mmt(dvM-af>Zmzb75WK*%EfEv^S?y|!x<3fsI@Uq#D5 zs0|8241P$UsX2#96d$>Cx}ks3FtoKaoXlk7O37h|rf$vLo)T^e<^{V+9HA;~CVNJVo(K+WNKCgh8N;1c@-WI>v*($K!45tocVro^xOtTD` zHgkc#a0AngZoD{2G}P<@F4{TRXfYN?cnNjQZW}}uvo+eppMA4Dbjv*&+a=8ca`+JH zu_YwWWR_j-Pz#}3=1(0mEnUYw-Bz_q#C2F-*svx^Fn-PqpHiJUFq25;v({ytD)eP# z3Wy(LY1k{OH(`zA=PK^iXEH=_rMW-x)Czoj+xE_M)pkWxsT4hu_8BbRo>~Ak)-q5; z@YNOqc9sQyaTNtz<7-pQBy)~|@JlK)v8xC7Y8ZbToE9Dzv05@c8&oUvL|hjm zePdB^H^qy!M%73#(A-6))<@t76l$dycnPm{G5Zl_bXWelI`4%%4`xsOxG*`{EcWOald3_Y1^eu1`Aqx=B?$X}uj47;>aHBureJQwDjq{&bk3(iKWZ1{bD3;(O*qL>4p0REMKdJa? zyHC~^^TLX}hA67>YC`R$p<2?+UEs6vF2>b3KKfhKoA<6(h02;tQ6*sl2(kV)ISbI= zVDvoZl{Ip1ODS4|5LuE<@wLO{Hy3%>hZ#Bc)_{2esi^$vD^t~GDrPH~K1_Umc)mbo zS&Z=VUk`NOU5pr@=5LQL{7j78_8OhoA9&OKjGyc;*_4bMxGB`a`_jkcj2rR!(M6sP z9Fb5FIRxK9Kj_;+$QH(s@_iYScU!#?g7|uIavC${g*-(b_=Bh0NGY?~3=bTUjED+t z;YP?M$!l~w=u4k{{f3fqOh3yl(b?g1i}$@!z4VpQ^p*QX&^3Sfqq;lJHb4z9dK(l_|Ut7Z?0#`dOAqNmARV4v0E>qs8)Z-BY?~H~R*{UaS|qIO(y;fi0p}`+n#`W3mGA7%}Nw}bx_!jwRAgC75 zr9gO(+a)P55kL>r{deo^bBeN3dB(5NHOflDOn|*TsC>MQ( zE&(u|pV~{A5HDAnUiz-Z@AikP4vklnvwB)^J;5IQPn;1$_w=*WbnENiE^;QLy@fN< zBw5B>SR=2000)}g_4BmM>JK#%M2N8iixb)?T^e>F`B!5IbwO;^hx5QK;G;0GD6v;GvER;YBA)Q)_Pb>$ z!`k<{-1ah*oJ^b6{4|1T_4eg@jPLnb+9qR`>P^YCNQ+`_O|>`65ZrfsLJVv-fQm)q zL^5(sikP4V_ixqI^|_jGp1Ik$nFMa zQF=E9N~N(ehRjB+OsElC(i4Wo=7-D3Z-U8f@4l21GXSRxnnDBO@@Q~OpC#JUnnj1s z=Zs6LPF?vVxmK>rJC&8;tvtl+@@BDWq?zk-h)!B}(tY-q=U)XfJ_k=9@&Az5veyv~ LC?{ltt#8Ud*$U?g literal 0 HcmV?d00001 diff --git a/icons/obj/structures/doors/dropship2_side2.dmi b/icons/obj/structures/doors/dropship2_side2.dmi new file mode 100644 index 0000000000000000000000000000000000000000..bff39827c359805e98ff1c9101fe22f05a0e63e8 GIT binary patch literal 2116 zcmV-K2)p-*P)fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM z;w;ZhDainGjE%TBGg33tGfIFQGZU`jlEji!AX6zNKffqGIVZn3HARVwGbOXA7^Ibp zGp#5wHxzPaZl*;4LuUK$r6BQ zX5$?pGj5Y50MS(OL0N)$Lg*MQV^ri5`-E7+hfU4QKLkZn#omNb(UkFFwFL2mnq&#M zmLQ%`lUf2M%w`F;mVmQ_x|V=Nr>-SD3DdR2UyIeVZTw=f`ud#}>sK6C>*f0Ui#xnt zu9r7vEMIX<)9Ll;c3FIVdOb~MtX^?UDAZX3CQN4uP&Ac@ya}VCsYC=5rk@Zfnkok2 z{)AZE-u?gO_KvrIfw4Q`o42dQi|rG8wpwhm02aFwW<__qK07(ve$>g?$>tltVt2ys z-;j5;#m{u%re^1cbhW622|KUJ$`}@@x`2m8>b;0$t37#^fC;OY`LIa6TTSemknUc( zx2n|5KzPyGq#;dwLx*LF-5np+-z9EXlO-6!2W1JimLR?%d{d@HE#bNCrLQG0k&aPI z0AqfPS^^=gUU9&C&FU40CQC4)JE)dWX9>8LP-h8bYW6nD(MG$`tcvNqR9~OePYk`D zgu4?~k4g0U{KNrNPqT~Cj#GVIUOF!-(V4TV*1TO(ZC1@Y0`9FVo3Oa`gc?4o&X2r4 zwsu~WZ_0EREo-887cFa|cNcBzt=sORWli+nqOJCt z)%F8Zl&uXOy+u1yOYDoV_sJLBLNj-Vr3lfuqiCDkz|FD z9^vQ>cQqdq)v4Rj@qd>1v?2WCmn<FOOGfV8(5@RFY z)Etg*))Ji&k8oy*&WJ~NuvNT?(N^&$s% zAFh#--OJ91M>u5nGF+C(TB0N3P0b}?`NkyQs;|d$Xpctd_z0`VBzhe_#L7+tv>)03R4wU89`01F1^8_Z zYQ!T9|8l4p!yRQmKEjzLJP0Fi%~7N5a9gpOZ`CliVm04@go_Th6|4DH+e%if<{LCi zWG#_|9}v!3A_*6SGfO1lg79eXDzGrzy9z9n{#+|o^EG!uN81?vkE zl5jydWR?iE%n#Q{$?jzmE(nM0UWUsOSxa<8ys0@H;gGdNDA9!@oLS|js(Fh%%_fq}Dj^9!~8lmI!!1FIlz@~Qgm;K>dqV*e2V8Xp$mhhx^7u*wiZpJ*} z7Vj?D5i(z&0q=yCF|7f#&A^)Iy+u2*CVFqtvgNJ2X!V4>SMA=Sr3rhBmL}{i+6II< zP}G?|xK)Xn(poG@sjZ!KDzFlnN1En0gF zldIU)qQwcf@U#;eunChU`qrYg$8hUqJSke7u=B~6s!?JR7N2~f>rKVfAsf0|;}F?-Ct9VN$g2gy|PG`Gb5>Qz9XT`Zb*} z*u86a!to}KaD=_rUmhQxnVz!m?ToJ<7(0000 Date: Wed, 22 Nov 2023 14:50:35 -0500 Subject: [PATCH 2/2] Typhoon doors, fixed hitbox dir --- .../LV522_Chances_Claim.dmm | 22 ++++++++++++++----- maps/shuttles/dropship_alamo.dmm | 5 +++-- maps/shuttles/dropship_normandy.dmm | 5 +++-- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm index 69e040e98ea2..50240fcd8d55 100644 --- a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm +++ b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm @@ -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" @@ -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, @@ -66448,7 +66460,7 @@ pRK qmM qGQ qTh -qzp +rjP qzp nfq fDg @@ -67810,8 +67822,8 @@ pUc qst qLz qVl -qzp -qzp +rjP +shh rFp sdE sIx diff --git a/maps/shuttles/dropship_alamo.dmm b/maps/shuttles/dropship_alamo.dmm index b86194646c95..6cd6922c22b0 100644 --- a/maps/shuttles/dropship_alamo.dmm +++ b/maps/shuttles/dropship_alamo.dmm @@ -218,7 +218,8 @@ /area/shuttle/drop1/sulaco) "rS" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds1{ - id = "port_door" + id = "port_door"; + dir = 2 }, /turf/open/shuttle/dropship{ icon_state = "rasputin15" @@ -482,7 +483,7 @@ /area/shuttle/drop1/sulaco) "Pf" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds1{ - dir = 8; + dir = 1; id = "starboard_door" }, /turf/open/shuttle/dropship{ diff --git a/maps/shuttles/dropship_normandy.dmm b/maps/shuttles/dropship_normandy.dmm index 44553cc9d1cc..a2847ae62611 100644 --- a/maps/shuttles/dropship_normandy.dmm +++ b/maps/shuttles/dropship_normandy.dmm @@ -351,7 +351,7 @@ /area/shuttle/drop2/sulaco) "En" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds2{ - dir = 8; + dir = 1; id = "starboard_door" }, /turf/open/shuttle/dropship{ @@ -584,7 +584,8 @@ /area/shuttle/drop2/sulaco) "SC" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds2{ - id = "port_door" + id = "port_door"; + dir = 2 }, /turf/open/shuttle/dropship{ icon_state = "rasputin15"