From e4c05ce3b952246a5cc3a081e017338df01ebe7c Mon Sep 17 00:00:00 2001 From: kyres1 <36868890+kyres1@users.noreply.github.com> Date: Mon, 19 Feb 2024 05:45:22 -0600 Subject: [PATCH] Fixes Point Verdant Code and Mapping Issues (#18448) * AAAAHHHH * retracts changes --- code/game/objects/structures/urban.dm | 34 +- .../kyres1-konyang_post_launch_fixes.yml | 11 + icons/obj/structure/urban/ledges.dmi | Bin 3679 -> 3673 bytes .../konyang/point_verdant/point_verdant-1.dmm | 476 ++++++------ .../konyang/point_verdant/point_verdant-2.dmm | 689 +++++++++--------- .../konyang/point_verdant/point_verdant-3.dmm | 87 +-- 6 files changed, 680 insertions(+), 617 deletions(-) create mode 100644 html/changelogs/kyres1-konyang_post_launch_fixes.yml diff --git a/code/game/objects/structures/urban.dm b/code/game/objects/structures/urban.dm index 959111ca8fd..68ac02a6f58 100644 --- a/code/game/objects/structures/urban.dm +++ b/code/game/objects/structures/urban.dm @@ -73,6 +73,24 @@ layer = 2.01 opacity = 1 +/obj/structure/stairs/urban/right + dir = EAST + bound_width = 64 + bound_x = -32 + +/obj/structure/stairs/urban/left + dir = WEST + bound_width = 64 + +/obj/structure/stairs/urban/north + dir = NORTH + bound_height = 64 + bound_y = -32 + +/obj/structure/stairs/urban/south + dir = SOUTH + bound_height = 64 + /obj/structure/stairs/urban/road_ramp name = "inclined asphalt ramp" desc = "A solid asphalt ramp to allow your vehicle to traverse inclines with ease." @@ -80,10 +98,22 @@ layer = 2.02 /obj/structure/stairs/urban/road_ramp/right - icon_state = "road-ramp-right" + dir = EAST + bound_width = 64 + bound_x = -32 /obj/structure/stairs/urban/road_ramp/left - icon_state = "road-ramp-left" + dir = WEST + bound_width = 64 + +/obj/structure/stairs/urban/road_ramp/north + dir = NORTH + bound_height = 64 + bound_y = -32 + +/obj/structure/stairs/urban/road_ramp/south + dir = SOUTH + bound_height = 64 /obj/structure/closet/crate/bin/urban name = "tall garbage can" diff --git a/html/changelogs/kyres1-konyang_post_launch_fixes.yml b/html/changelogs/kyres1-konyang_post_launch_fixes.yml new file mode 100644 index 00000000000..ab86635919b --- /dev/null +++ b/html/changelogs/kyres1-konyang_post_launch_fixes.yml @@ -0,0 +1,11 @@ + +author: kyres1 + +delete-after: True + +changes: + - bugfix: "Fixes Point Verdant's stairs literally obliterating the server by making their directions work in accordance to their bounding boxes." + - bugfix: "Fixes duplicate stairs on Point Verdant." + - bugfix: "Fixes some inconsistent railings on Point Verdant, forcing players to walk through them to climb stairs." + - bugfix: "Adds a light switch to the Point Verdant street vendor building." + - bugfix: "Adjusts the location of deep water on Konyang to avoid structures, so the overlays don't conflict." diff --git a/icons/obj/structure/urban/ledges.dmi b/icons/obj/structure/urban/ledges.dmi index 1cafd46c5a64c775f217fe85f1dcc5d59d8611d6..79bb3cd6e046cd91cc2d3e8291c08ea7a0ee0b6d 100644 GIT binary patch delta 3649 zcmXw6c{tQ>_x{Wb#xfykh+$C47q5LA#Mq)_DTG8b6;aB_6cO_Yr9vi4q=~UF*+K|0 zmMCkRC4*>0_OT2#48Q67zQ4bobD!(J?{lv6T+el#=R4{fiflyE)WWE!YOAU1>FOOd zF^r4`002TfZSMqNr-yyGv0$jP8`07`=;94O0?{wvIsk-FUL^P1w`m|c`g@%$>6iyC z!sqI!cD^x-`->~;?Q+E=I;G1U1_f@Gf`+4%sm<`j-F90}W%!uPx=*vyW$G`@UzguD zHMqVjC?C!vwK1ZUQNKG@SfbywatV|E9?$2y&G)Aiq+QQ+K9v+6W80WsVVw);RLp07 zOGrA*mw1-MFy9o<4gO-@JH01h!L{m+@Ks5pf6(ON&SMGv^S>;)_!WIR;|j zR{g+osw^u^|62w(Vm;h}Yu=FR zl>Y}tHx}7hr%?*|pygOyM4`Bg`Bv3h{RlyQWal1{sq$ohibJ2!Cj0sgTIR#}Uk9E+ zsPo&m$HDTK>M)Qf=EcjD9unZ4b6b}JrTau?54;e-k>+ExdHp$LXwyDTKIeyOI7W<& z9Npa*$qjO1o~-~^O(~kV#h9GV7EQ<}5$lAgi_mQJV_BaLUZRnSzBX;BkCJAG^7qny z9L1Xdf$vz$=Rx6ximv*ZS)r=W->cV%z6$t?!toFTK{?d{Ri716YEYlvv1LAOC`IViK zbLmAFycIOWfz@0HdE1Ql&;Nqi zf0_cK&xf4*_70j=cimu=Ka~)yj z(X19gyk4%%`pGgpD$ib(Nf*Of=LPVD#O(iwE&+;m-h;m`-U6M^3k*NBy-}oGMzqeW z*%A2Y*j(#1q`uj!`ZL&BjFTee`1O3zI_WiJUfEffrr(#)2bp47^Gq=)GIHhRJPT8o z@54kn!A_jul%@^UrwE)$tQBXawFl}e4L=M!ck=u{i4e7X(?0asRQwsg(Jx2aNw% zO5waQwx6NXde>CoWJPK^h$~3cmp3U^=;su!wlv1AT#7-2xbZk0IqvI$0l63XYs*{q zn7J;ZQPj>ka*C9fIfa4V^~cX8$JHExBLa>4qSeNkmRn{O-NGraw^9D?n%-9C^dwm8 zYs9qq*8SMoDQU{3I7OqWSY~8!A(*I%*2NtciO}VipTxQk%*^XHl{%DUom*eL%kj@<_Iszg1}_-s+L2d`0DfA zlV4PYvg2yhfjXgZs-NNwUVcS{T*lO1fRAuYg{q(~XZcr7KypeRbSonDq=O@rUrNH% zND>R0M^&p3g&Oq_xb?%Cl_g5G^c;yn5ZB5C)cDol0!a3`uFu)DZnU2?EPZfS!}rqG zAs;i&bl|D!+oXhpHUjeDrHH3Kar-}&byY>zXj0cZ;)zIf*DBcx?-n+B3Vl*?M&3Nqdze^SRgTkG2w4_rquYu{>OHwes)FFT=YkBcLvW;i&(^D8WbvOg15xM=g{o9AR z-26|SZu~=|{A${MQV@sA*jD8fB)tRtOfMJX)U~Ua4vW}pHHEVy)4qZbymxX3*?ZEx zw9GK~8bayq-SCkCGk_tZ7V+}xE@==YmnPa*vAk7reWXg~?taZ-^@7DuB#0k}2?WUp z@K1(EtPM-&4+J)TUk3{YS3DoS=nH%_vD1#gypz z(Ip-C!~HlK@tiKWJe>I{di0RRzDVf~ri@$ln!9eyUxIF|A4gPun=ID43qfp4H*?BX zTeaSckc0lDz4?)Mk5pp~&t+MVV%6O8CC3zy0$Z?_Xh>AIoSTGN&wHNOe?H5~kRzIu zFQni-H6Ae%T>D6-x4riAX%4?UTiIsn_CAR_@M_c%*d>>}^Y1$)11D=WTK1*C%gVF} zl|lP%9cwm;fnK-c%cT*s9Q3ip8P>xO#n`MjT_<>tdaozHBmw*T59WH zI%VE$0_TgiO(M*)nZ}_fhyXmp+NRdb=&!F1&P`B)w0sUbyT;!DDzY#q6MnDHHfIb4 zULl<=n};WxB#?I~3=X&1nTQUaBnRwDOLescOSKGgnA=^mtNWPm(99A=*=pwW?*#Tn ziBdh7IJ5UwTimU1VdDy~DGJie;HN4OmT5iA`?a)x48ziT<#{X{(f}F;l6UtQ@h-HR zjj<_PsSNY2YSHowX9_Idx{tE6424N^12b}bgL#jf{$Xsgh1s|9`7Db$F&S(xm(D2~ z4pQYCI6o*>v1Z&Vi!Ei3zW9>doql7)I$W>+aa3*q;geo(r$HJHTCIdVt^Vm6@q8zid zBEhs`_fcNwp&7Y&zknSVeK=kH3gDJ{JPtCzdSevR9R8@*)dQB^-eQP5&}nv)>#9P6 zNd-6tWn@dkhwMntJ{SuZ&jpcf)@qsZIuYx;Zq>*GxFjNFua7tj^B(rcPIThIw(}Pr z|88OjSjNy@R&HbA(ru>aE{5j~Yma>Sms&v~xv0zO&IwaoJAcNmxO*geDpvYyR;op<~5NT5s>Fl9dK#bKJJDY7Q?6x&oh|jlH{k!z)%CRR) zAS*+6T;Ye%wEC!R*bovJ^`GAJ`!_=IPQ6}?^Y!NI6+9cnYr;jNO{N$3EX?f_X@Fb>K3U@9`BTw6$~q-${t9$ z;Ep``?~Z>P&3C6!?nHCp($#aKdFQ#RH+mDhzy}45Ihfp~%iP}~aNNq?vdkP8`G4tO B?&<&l literal 3679 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