From a0f0f4b6ef3230a2ac67b7e2572e033621287a1d Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Sat, 17 Aug 2024 14:03:28 +0800 Subject: [PATCH 1/2] UPPAddit --- code/game/turfs/floor_types.dm | 30 ++++++++++++++++++++++++++++++ icons/turf/upp_floor.dmi | Bin 0 -> 1767 bytes 2 files changed, 30 insertions(+) create mode 100644 icons/turf/upp_floor.dmi diff --git a/code/game/turfs/floor_types.dm b/code/game/turfs/floor_types.dm index 096b39e988d2..844099f12d0f 100644 --- a/code/game/turfs/floor_types.dm +++ b/code/game/turfs/floor_types.dm @@ -840,6 +840,36 @@ /turf/open/floor/almayer/empty/vehicle_bay/get_depths_turfs() return SSshuttle.vehicle_elevator.return_turfs() +//UPP Symbol Floor +/turf/open/floor/almayer/upp_floor + icon = 'icons/turf/upp_floor.dmi' + icon_state = "upp_c" + name = "\improper UPP Logo" + +/turf/open/floor/almayer/upp_floor/directional + icon_state = "upp_directional" + +/turf/open/floor/almayer/upp_floor/directional/southwest + dir = SOUTHWEST + +/turf/open/floor/almayer/upp_floor/directional/north + dir = NORTH + +/turf/open/floor/almayer/upp_floor/directional/east + dir = EAST + +/turf/open/floor/almayer/upp_floor/directional/west + dir = WEST + +/turf/open/floor/almayer/upp_floor/directional/northeast + dir = NORTHEAST + +/turf/open/floor/almayer/upp_floor/directional/southeast + dir = SOUTHEAST + +/turf/open/floor/almayer/upp_floor/directional/northwest + dir = NORTHWEST + //Others /turf/open/floor/almayer/uscm icon_state = "logo_c" diff --git a/icons/turf/upp_floor.dmi b/icons/turf/upp_floor.dmi new file mode 100644 index 0000000000000000000000000000000000000000..e52b87f21f48d642a8acbdf71f156a5bde5cb656 GIT binary patch literal 1767 zcmV004jl0{{R3eocQU0000LP)t-sz`(#$ zTw5_XI~pJ&MomjRLP6Bl)=_g_J^%m!0d!JMQvg8b*k%9#0DXE?Sad{Xb7OL8aCB*J zZU6vyoKseCa&`CgQ*iP1C^0t`#5P1#1yqrmTmm#ZF$baEf++QdxHKp$ zxca$(-3Wd00s9+L_t(&f#sTAlH({0$9)B-x^jTt8_b-b(-bFg<=u{o z`yXKeA&|tElXUOP`eA6m{44{K{wA}yeO=e9JDl_7>K-m$`}Y_Ak?QXI%iomi>-ueZ zzptnJ9*YCxFAt*59^pzeW>p z@x|BuwhUL*&*^LqA+7EQZJTOU)vC`{896zAUMdUqzMSnt+Spg}lp5IeoS~;=p!VH9 z@VqaJ=%S;~{}edNDOU-+AdqFbI-J>I)+>gfVRIn$ck(ie^l@AQa-|SGK`Dv8a?qZ( zVj3CM2DE||8FuCsv+U@RByi^&5pR}>&u2m};yGvHkg4(wILt3kCG5oB9Hhh+u4 zPJ!f-GAhNoeF+E&AcII~Z(1lz9)265UAA?bzuDSaV{1sw(l$JS1Jv!U(tv0(OH4c zEW|b1YrROXtaHV=Ic(@fON*jZd|u7bDualhsU)CyGAL=$^b{dQv{ccqcM52lK#bh4 z_%d{W?Ra=9+Vn*HOF(FVSdc)VWiB-VLK9R(eA3tq80V~?QwE>Eu}r`cer8$k1z zo0m@lOFWw?hlbKHwLTQ$d#r8FSysmP`59$2>b$YoFkf9 zkL8>eaG1q7khc$kqdd!jfcdR5Q z+^hDexM@nP--k-y{e4ys?osw7Ik>JR(f1Uo(1&cUNIzDBlWyo~=8neBbC`|}lBD)2 zfClzdeeWxPRvApnk}htm=z7ENj+v)`5T;uM4!?}1z%&IoC4fiw*7d*LPWo~_16yWa zmoG#cGyML2C43FP&|iv&t_6e?4+$vd(w+k5KuZr`z;4#-97r~S;J99tz?A5fWCkOE z&66UEe_A;pck3NU_Rq4ih02m_Vf#SR#c0yegD!rRs`JATg~I)n;CxpPR)Vvq2a|=5 z&iNugKNS5fZ4>8^wnHaQ@;R5U+|Y$;m1TcpSI9-t%g*-U$inVdY2*A*Z|n+Kd6ocH z=ZD4O8Bou?*x2F~X$ou&%)c5RoxoYrUxRxIVz>dQKOR*{oVsz3O^Z^{VUh!)o7gy$E!lh(3VhhpxxJq>AS_`oAPb0xdAl839eM zTOJgo@9JPN1R5uUMJ4+T{seDN0}YRlV9GC&3<$h`3N$Q&V+lq9v*qp-@aY_L3h185 zf}MES1UCDbK^@?mO5%)#64 Date: Thu, 29 Aug 2024 20:58:29 +0800 Subject: [PATCH 2/2] Update --- .../objects/effects/decals/floor_symbol.dm | 53 ++++++++++++++++++ code/game/turfs/floor_types.dm | 30 ---------- colonialmarines.dme | 1 + icons/turf/upp_floor.dmi | Bin 1767 -> 1131 bytes 4 files changed, 54 insertions(+), 30 deletions(-) create mode 100644 code/game/objects/effects/decals/floor_symbol.dm diff --git a/code/game/objects/effects/decals/floor_symbol.dm b/code/game/objects/effects/decals/floor_symbol.dm new file mode 100644 index 000000000000..17d61d28a6a9 --- /dev/null +++ b/code/game/objects/effects/decals/floor_symbol.dm @@ -0,0 +1,53 @@ +/obj/effect/decal/floor_symbol + icon = 'icons/turf/upp_floor.dmi' + icon_state = "upp_c" + name = "\improper UPP Logo" + layer = WEED_LAYER + +/obj/effect/decal/floor_symbol/westface + icon_state = "upp_directional" + +/obj/effect/decal/floor_symbol/westface/southwest + dir = SOUTHWEST + +/obj/effect/decal/floor_symbol/westface/north + dir = NORTH + +/obj/effect/decal/floor_symbol/westface/east + dir = EAST + +/obj/effect/decal/floor_symbol/westface/west + dir = WEST + +/obj/effect/decal/floor_symbol/westface/northeast + dir = NORTHEAST + +/obj/effect/decal/floor_symbol/westface/southeast + dir = SOUTHEAST + +/obj/effect/decal/floor_symbol/westface/northwest + dir = NORTHWEST + +/obj/effect/decal/floor_symbol/northface/ + icon_state = "upp_directional1" + +/obj/effect/decal/floor_symbol/northface/southwest + dir = SOUTHWEST + +/obj/effect/decal/floor_symbol/northface/north + dir = NORTH + +/obj/effect/decal/floor_symbol/northface/east + dir = EAST + +/obj/effect/decal/floor_symbol/northface/west + dir = WEST + +/obj/effect/decal/floor_symbol/northface/northeast + dir = NORTHEAST + +/obj/effect/decal/floor_symbol/northface/southeast + dir = SOUTHEAST + +/obj/effect/decal/floor_symbol/northface/northwest + dir = NORTHWEST diff --git a/code/game/turfs/floor_types.dm b/code/game/turfs/floor_types.dm index 844099f12d0f..096b39e988d2 100644 --- a/code/game/turfs/floor_types.dm +++ b/code/game/turfs/floor_types.dm @@ -840,36 +840,6 @@ /turf/open/floor/almayer/empty/vehicle_bay/get_depths_turfs() return SSshuttle.vehicle_elevator.return_turfs() -//UPP Symbol Floor -/turf/open/floor/almayer/upp_floor - icon = 'icons/turf/upp_floor.dmi' - icon_state = "upp_c" - name = "\improper UPP Logo" - -/turf/open/floor/almayer/upp_floor/directional - icon_state = "upp_directional" - -/turf/open/floor/almayer/upp_floor/directional/southwest - dir = SOUTHWEST - -/turf/open/floor/almayer/upp_floor/directional/north - dir = NORTH - -/turf/open/floor/almayer/upp_floor/directional/east - dir = EAST - -/turf/open/floor/almayer/upp_floor/directional/west - dir = WEST - -/turf/open/floor/almayer/upp_floor/directional/northeast - dir = NORTHEAST - -/turf/open/floor/almayer/upp_floor/directional/southeast - dir = SOUTHEAST - -/turf/open/floor/almayer/upp_floor/directional/northwest - dir = NORTHWEST - //Others /turf/open/floor/almayer/uscm icon_state = "logo_c" diff --git a/colonialmarines.dme b/colonialmarines.dme index 8b48448326cb..bd3ead106934 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -1038,6 +1038,7 @@ #include "code\game\objects\effects\step_triggers.dm" #include "code\game\objects\effects\temporary_visuals.dm" #include "code\game\objects\effects\decals\crayon.dm" +#include "code\game\objects\effects\decals\floor_symbol.dm" #include "code\game\objects\effects\decals\hefa_cult_decals.dm" #include "code\game\objects\effects\decals\kutjevo_decals.dm" #include "code\game\objects\effects\decals\medical_decals.dm" diff --git a/icons/turf/upp_floor.dmi b/icons/turf/upp_floor.dmi index e52b87f21f48d642a8acbdf71f156a5bde5cb656..c4413310c3adbf51b678d68ec2cf102f55efd244 100644 GIT binary patch delta 1029 zcmV+g1p52u4eJPy7%Tw;0002Ct?*a?000J1OjJd{z`)ej))|E|A&(U}YFKvp@&X2h$*YWcUHXj}ihyfbjDzi2s5f zU<`BhHw0N*3_F2dLSjVEJsq_EpLT2#$7qw^M*86l8aMETDA1$i+EH7nwSUC8vIeCp1MjB0=M+af3Y-$OE!WGn zE9iPIjf*?!kB5d{XLuZ?dkSBARzO(8^IqhDTu&eH$#&0t%ueJ0texQRZFihf*7VCN z3s~814kkhWb}d=Cx^r?&s3qKle5PgC(V3*R{B@BtO&`yV#u?|Lk}CNO z9{r_2Gt3!&!4RRH7WfszC)O&xzQAu79$Bm5IGGGTWB4Vb@JvuEbC2Pe3U0FXBoLui zdj+*G1+<_Ylt(||g+Pg_%5W=CzSIaj*njR+ky=3YLrOW_x#6}WU4bf%GYD{@{C)CGEa6k~%@Stc^rLDO7T>h3Y849K?6Wg0 zzUjy8Ap}!LU;6Ae1b4Cb=Y94ia;{lbk{ygZ&Z?fW*L9X{EkSj~Hy8OPCN+DlKa{?i zJ-PJF?B1nso{{4XdnkSLWzU(NV@~dxvla$Q-?XtXEtI}#deLePrEmH+{pV`%DW{ct z#ob(B>MDytVeWs0B}_`GeDgQl+G>HX)mN@R>Vo|n;y6bs00000NkvXXu0mjfsubf& delta 1670 zcmV;126_4G2nTQN908XzJ@O-npNLDbgP zQFC5C00001bW%=J06^y0W&i*HeUU_9e?(OURFRro0yH}@2ch1ADD{T8G$<>$`niDJ z4FH37I3!K5)k^>X1@}orK~!jg<(gfR<0uTreFdkwa)90&%$%Up6en=y-HwX;A7KF@ zki?ghbnnahVQ9eoECZ7MCbPJGUDvBSob%=C9xh({_ZR+=>hAl?-<0d?`fYi?f3K(e z9*YCxFAtrX*=r9;o{^0mh6)+=K)>h`*ZY0I_BeQd-(l^e^VL9S;sfFUL{}RBHYtz#?=L-7qLwDE1=p(X*F>bbzK61 z-i+!A$ZpIon6{Cwvw;m@EEnyI$pbJ~6d+d!1Qc;I;9U+5>{Z08LA4kWWLrRoWd*!W zf#i}hD#f~e2?z-wgGgv^S}02%h4d?HpaB8Ao(6(7If#%$VE?PYf3VC-QHalqaFxuT z2i|%6y_yn`9#()_o1~5lSZ<-I-k>265UAA?bzuDSaV{1sw(l$JS1Jv!U(tv0(OH4c zEW|b1YrROXtaHV=Ic(@fON*jZd|u7bDualhsU)CyGAL=$^b{dQv{ccqcM52lK#bh4 z_%d{W?Ra=9+Vn*He@j4UfLM?~pk*#K0YVd0M10cN3>fFEpHl{(zp+ff5`Jb`?*(8q zv747q0!uubDTjvAFtt7u;(M%Z&RJOES++D_c8n&u?iz9Mzt@M2GFbMI=ZSmPhl{>u zbAodS)#n540v8o@d{Fr7(b9*iOxs52!wo-pLi}WcGo;g#e-fdj1~wM}l%+D9pmW5NEunu_Yn zQM}x%_NcgNe@d+1hf3f5eO3?dQT8P{xUMD9_Y|qnhitA$KURX1Zs=*|j>gV&n2rvT zr1mL*2KH2a?<;^-8BEHOE^e#ndc*IInWumdrdtFKzl^59GzB;%fJgV%^}pRt`f@%4 zTV`LEFGL$N{Qi98^wnHaQ@;R5U+|Y$;m1TcpSI9-t%g*-U$inVdY2*A*Z|n+K zd6ocHf9HqA;u%oSz1Y~|6=@1=4b1HXgfqY#aIFTGc8Z@`U$%iXKwIcaJ4JY{F9*Q- zl^vUk0+frBgM-}2(GsgHO#4%2Nxi{4zz~r!Uu(Un^SDD|0b*XIL=8u!9F$(9c2XL+ zf0?JC97|Hdmfx4foHD(r+p)?l+@;t#l=?cfe_qt>SS|YUH_i`*VAKk>(u-DEWR=AW z$RAOwIcr22F=u*C7m(SkT2;O3dR6tR>+{2E-*LSNbf1Vmfa8a*$G@bC=Q#SmBt`-) zFwYqQO|DxW6r}I!U@-(5Cxb;L`wadBZ%+dakB?x=FOm!hynhNbEP`VRMgg