From 68e8333200f7e9e6146868a4090a5db0ea696dbf Mon Sep 17 00:00:00 2001 From: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> Date: Wed, 7 Dec 2022 18:08:18 +0100 Subject: [PATCH] Adds Sol Floor Decal; Makes Big Floor Decals Rel. (#15231) --- code/game/turfs/flooring/flooring_decals.dm | 62 +++++++++++++----- code/modules/maps/planet_types/barren.dm | 2 +- html/changelogs/sol_floor_decals.yml | 6 ++ .../scc_decals.dmi => decals/big/scc_5x4.dmi} | Bin .../big/scc_5x4_preview.dmi} | Bin 1377 -> 1371 bytes icons/turf/decals/big/sol_5x5.dmi | Bin 0 -> 1510 bytes icons/turf/decals/big/sol_5x5_preview.dmi | Bin 0 -> 1431 bytes icons/turf/{flooring => decals}/decals.dmi | Bin maps/aurora/aurora-6_surface.dmm | 2 +- maps/event/idris_cruise/idris_cruise-1.dmm | 2 +- maps/sccv_horizon/sccv_horizon-3_deck_3.dmm | 2 +- 11 files changed, 56 insertions(+), 20 deletions(-) create mode 100644 html/changelogs/sol_floor_decals.yml rename icons/turf/{flooring/scc_decals.dmi => decals/big/scc_5x4.dmi} (100%) rename icons/turf/{flooring/scc_decal_preview.dmi => decals/big/scc_5x4_preview.dmi} (75%) create mode 100644 icons/turf/decals/big/sol_5x5.dmi create mode 100644 icons/turf/decals/big/sol_5x5_preview.dmi rename icons/turf/{flooring => decals}/decals.dmi (100%) diff --git a/code/game/turfs/flooring/flooring_decals.dm b/code/game/turfs/flooring/flooring_decals.dm index c87f9769d25..6b591024176 100644 --- a/code/game/turfs/flooring/flooring_decals.dm +++ b/code/game/turfs/flooring/flooring_decals.dm @@ -4,7 +4,7 @@ /obj/effect/floor_decal name = "floor decal" - icon = 'icons/turf/flooring/decals.dmi' + icon = 'icons/turf/decals/decals.dmi' layer = TURF_LAYER + 0.01 var/supplied_dir @@ -699,20 +699,14 @@ /obj/effect/floor_decal/sign/srg icon_state = "white_srg" -// the big SCC logo -/obj/effect/floor_decal/scc_full - name = "full SCC logo" - icon = 'icons/turf/flooring/scc_decal_preview.dmi' - icon_state = "scc_decal_preview" +// Big Floor Decals +/obj/effect/floor_decal/big + name = "big floor decal" - var/list/decals = list( - "0,0", "1,0", "2,0", "3,0", "4,0", - "0,1", "1,1", "2,1", "3,1", "4,1", - "0,2", "1,2", "2,2", "3,2","4,2", - "0,3", "2,3", "4,3" - ) + var/decal_path + var/list/decals -/obj/effect/floor_decal/scc_full/Initialize() +/obj/effect/floor_decal/big/Initialize() ..() for(var/coordinate in decals) var/list/split_coordinate = splittext(coordinate, ",") @@ -721,10 +715,46 @@ decal_turf = get_step(decal_turf, EAST) for(var/i = 1 to text2num(split_coordinate[2])) decal_turf = get_step(decal_turf, NORTH) - new /obj/effect/floor_decal/scc(decal_turf, null, null, FALSE, coordinate) + new decal_path(decal_turf, null, null, FALSE, coordinate) return INITIALIZE_HINT_QDEL +// SCC Preview +/obj/effect/floor_decal/big/scc_full + name = "full 5x4 SCC logo" + icon = 'icons/turf/decals/big/scc_5x4_preview.dmi' + icon_state = "scc_preview" + + decal_path = "/obj/effect/floor_decal/scc" + decals = list( + "0,0", "1,0", "2,0", "3,0", "4,0", + "0,1", "1,1", "2,1", "3,1", "4,1", + "0,2", "1,2", "2,2", "3,2", "4,2", + "0,3", "2,3", "4,3" + ) + +// SCC /obj/effect/floor_decal/scc - name = "\improper SCC logo" - icon = 'icons/turf/flooring/scc_decals.dmi' + name = "\improper 5x4 SCC logo" + icon = 'icons/turf/decals/big/scc_5x4.dmi' icon_state = "0,0" + +// Sol Preview +/obj/effect/floor_decal/big/sol_full + name = "full 5x5 Sol Alliance logo" + icon = 'icons/turf/decals/big/sol_5x5_preview.dmi' + icon_state = "sol_preview" + + decal_path = "/obj/effect/floor_decal/sol" + decals = list( + "0,0", "1,0", "2,0", "3,0", "4,0", + "0,1", "1,1", "2,1", "3,1", "4,1", + "0,2", "1,2", "2,2", "3,2", "4,2", + "0,3", "1,3", "2,3", "3,3", "4,3", + "0,4", "1,4", "2,4", "3,4", "4,4" + ) + +// Sol +/obj/effect/floor_decal/sol + name = "\improper 5x5 Sol Alliance logo" + icon = 'icons/turf/decals/big/sol_5x5.dmi' + icon_state = "0,0" \ No newline at end of file diff --git a/code/modules/maps/planet_types/barren.dm b/code/modules/maps/planet_types/barren.dm index b954cc02c67..3a939a90ea2 100644 --- a/code/modules/maps/planet_types/barren.dm +++ b/code/modules/maps/planet_types/barren.dm @@ -43,7 +43,7 @@ /turf/simulated/floor/exoplanet/barren/update_icon() overlays.Cut() if(prob(20)) - overlays += image('icons/turf/flooring/decals.dmi', "asteroid[rand(0,9)]") + overlays += image('icons/turf/decals/decals.dmi', "asteroid[rand(0,9)]") /turf/simulated/floor/exoplanet/barren/Initialize() . = ..() diff --git a/html/changelogs/sol_floor_decals.yml b/html/changelogs/sol_floor_decals.yml new file mode 100644 index 00000000000..d72704f7a3a --- /dev/null +++ b/html/changelogs/sol_floor_decals.yml @@ -0,0 +1,6 @@ +author: SleepyGemmy + +delete-after: True + +changes: + - rscadd: "Adds some Sol floor decals to the code." \ No newline at end of file diff --git a/icons/turf/flooring/scc_decals.dmi b/icons/turf/decals/big/scc_5x4.dmi similarity index 100% rename from icons/turf/flooring/scc_decals.dmi rename to icons/turf/decals/big/scc_5x4.dmi diff --git a/icons/turf/flooring/scc_decal_preview.dmi b/icons/turf/decals/big/scc_5x4_preview.dmi similarity index 75% rename from icons/turf/flooring/scc_decal_preview.dmi rename to icons/turf/decals/big/scc_5x4_preview.dmi index c2c0b6bb4511d62c1e84fe2d9f8305ebed3b9803..c721cb1094cabf6938a6f42e9f93b1aed83cfa19 100644 GIT binary patch delta 58 zcmV-A0LA~|3fl^hQUP(1Q%@={C`v8MOf6U9;!MdbDh8?G;!G<_%uR)`l@(n5T)@Ty Q05i=U4aK@Wv$4{T1jODMF#rGn delta 64 zcmV-G0Kfm+3gHTnQUQ07Q%^8YNli}7i7zNhEz3+TSK{JK$t)@cspH~ID@x2wg|L+s WT>V_YmH+?Aj+E1}%#Q?D%NtPu diff --git a/icons/turf/decals/big/sol_5x5.dmi b/icons/turf/decals/big/sol_5x5.dmi new file mode 100644 index 0000000000000000000000000000000000000000..c3738fb9a3ccc0c66bd1016d577d0d3c1b6b8ebe GIT binary patch literal 1510 zcmV005u?0{{R3u>tjN00006P)t-sz`(%B zkRfFDZ*Bkpc$|&Xu?oU45XSL2 zd5X}kK`wWI0Wb_00gM8Md;ps3h5;jh zQNWOApt)`sFaj6_40!>X>xKa%fKkAZSD?9W7%&1D{cl>=kKOlaKTitu>pRtWH2?qv z)Ja4^R7i>Km%nZsM-ay6bOP4}p=(tTIsO|6_ALAdbGIE70&|y5#DkM z`xswy5u==U;Vk4UrB30wP0BSIukaZ$81Tw!Lkl&mVNQURF2S@-4R|OUm~Ta*?M|nQ zfVKuKC5tX5Shlvp$gG3?3CYy{BJgR1kG^}n>jRR%{gv+sUykQ1(>*@};KL*d?5hOl z`9tgxOxZQ`y*x9!Kx5fY%N>@?@uJxK{wSCF9vvjdPAp;?5-jw~Ha?de^E$w$vq<&6 zT_6&&)MCs`7@{SO`mA=$4*2G7u~hL<|LLcsN8ck*c=@3FNyf=^$HcN%Sx)u1(<;-= zupd#65yc-&iCpfeNO9l72y>g@2@EtT?l)E1R-ZkyZF?k_7e=1ICd_1YQXXJUXZg9D z&uq7W9!jXs&AqY>#`0MRT5ap6CNa#;gce*z`$)p3XH@j_$Y% zj1YZH4Ol>4Z3>x$E4n^qFl=F+U>24IA#+_N&9a9pCTVZl47*-0=zYKk&WWtZ3~ql< zFb{W4mp=)MzdQK(ZJjc0%cGiW2ft7Q>_?dCn>s=Iz%bAAi{2#&+mD8dfR*lelzCA( z8fwRI`MAbsjw)j`OO-{h0qb@~AE6#K^nLAe!mwcS+d>P>KPzhx;^xH_(`33;nIIRZ zEIt0mz_q(-h@UxOc;#Vo)74Fs%6BElOs&IZB()(sHvts44O|@v~(pKP6wttwuegbt^HSx^_9QVRw0CtK>noPb&8f| z)4s(fB?Px^Ca^Rq$=LfafiB&~r1WtDwM^p*Ke@bLQyP+PXW78Ao7i8^7w&pA=;pCE z#n|m&l-UfL%5^lV*l541OZBj`64wWOKjyL74wmwwfv$7@_a(u90qtG7a`IrYEdT%j M07*qoM6N<$f?3AYzyJUM literal 0 HcmV?d00001 diff --git a/icons/turf/decals/big/sol_5x5_preview.dmi b/icons/turf/decals/big/sol_5x5_preview.dmi new file mode 100644 index 0000000000000000000000000000000000000000..3ab25c0f86e1c5ee6cc62f2d1adaef380a147e72 GIT binary patch literal 1431 zcmV;I1!($-P)005u?0{{R3u>tjN00006P)t-sz`(%B zkRfFDZ*Bkpc$`yKaB_9`^iy#0 z_2eo`Eh^5;&r`5fFwryM;w;ZhDainG49$R?jMU8Zj1nlXxFoS8706a9&d-T2C`v8M zOf6U9;!MdbDh8?G;!G<_%uR)`l@(n5T)@Ty05*gj9tBg%8vpKmcMS} zMi9nlO+$Nyplw|Urh&YGO9e2zc@zg%T&r|f7+M+vq9%YJ;U48E2#A_X@(8A(!c}r> z7)bVT^iICnB`wM?kQ7JRqV(hbnVtD&MnvDP|Mn{C{6D-ZR}rbUI2d=sa$_|dYgSQi zZru!Esav_(`!Imc`1H)T1IT5XXMEhVn`kS!EALd#)Uth_KTX}ui$Tlh&J=Cey-|9_ z{bPPH%B;BC)$!W*R<4-w`Irpzy0_E4_grVFdDg)zc3i=|*g|m|k2{FH3sNB&x`z!FmB6{-I7!emSEQ=~!@b%=jL|iq zX{d~4g5g@6(iD*_j<85jg_#kkBO%Vstb=pdroD~|9$ZYzD#4ws8Fa(~WPeYv2zPL- zZZ!)ue`omRBi7eZUgG-8s1p<)Xgo3Uf$tK8?MHa04DB7}sRHo<6te^x zSxnvFy`TcSt2Rx99#kDi;v?_45#QIY5E!N+>@{Kv71y&9I_lE6cIRWAleVMkJ3+f@^X7 zZGuooksRoj5|lE*D#`YUt}Znlz$T1nJ}LLGmQ?g(x)|A%3_YY!U(n@faR}S`nrwon z8A`q_>Xz)!@QjKXZeY#=<)Qop1#dgJgW>iq;BPIC8eIo#vhM)@3_}QkfA(aavG^YP z3?-}G3k*tt=6fvu0$a6W5y1wBeA#`WHrTA-m595uGfdPPP_dSJ*g*uY5nn}faCVid z*k$<&B9QfKe+GX<^X$(T&%<>Sx=v6H;RV^k(J-3SR`BOiU>A2WgqQHrZn0O0q#&>0 zkf+5N;6tyaH~c}o6wi8riR#AAibLZ0UY{P&i9_1C$h%ka*m4JpJw&iYv|)~ucZtx_ zX_@5i1E9}&1eg=N2{56~85aRX?gk@Oq?P0*Ey$*hQHTT2=^hrH&?(tcR7NuyFZm9+ zO~}qttvg8tp)DDUjL4pg(`cMvt|23Gb3!%s6PdJ>OlmY2ZWl&jCuqEP-=)}1<=a+Qbh!iqF8vAxdqlK`(Rl$Z)2LT7^1 z-!!|K?1<{^hR%j7%Str++a%-Rx(@9xyhCMfC1^Z zg|yY&O$~otw`VBU(m^>LT@KIpaf(RLj1BiTVTu$qQeW6|-%Rnz-C`^A$p3KPpfx`r zP)W|)?6~es8