From a304c1442eabf57379bc9686db252ce7e2b44c9c Mon Sep 17 00:00:00 2001 From: MrSky12 <71841824+MrSky12@users.noreply.github.com> Date: Tue, 14 Nov 2023 21:28:35 +0100 Subject: [PATCH] Candy decoration update Added candy lights and more colors to the peppermint candy flora --- .../food_and_drinks/objects/candy_flora.dm | 17 +++++++++++++++++ .../code/obj/structure/candylight.dm | 9 +++++++++ GainStation13/icons/obj/gslight.dmi | Bin 0 -> 443 bytes GainStation13/icons/turf/decals_candy.dmi | Bin 1220 -> 2887 bytes 4 files changed, 26 insertions(+) create mode 100644 GainStation13/code/obj/structure/candylight.dm create mode 100644 GainStation13/icons/obj/gslight.dmi diff --git a/GainStation13/code/modules/food_and_drinks/objects/candy_flora.dm b/GainStation13/code/modules/food_and_drinks/objects/candy_flora.dm index 87b525a5..657da5b7 100644 --- a/GainStation13/code/modules/food_and_drinks/objects/candy_flora.dm +++ b/GainStation13/code/modules/food_and_drinks/objects/candy_flora.dm @@ -18,6 +18,23 @@ icon = 'GainStation13/icons/turf/decals_candy.dmi' icon_state = "candy_decal3" +/obj/effect/turf_decal/candy/greenwhite1 + icon = 'GainStation13/icons/turf/decals_candy.dmi' + icon_state = "candy_decal_g1" + +/obj/effect/turf_decal/candy/greenwhite2 + icon = 'GainStation13/icons/turf/decals_candy.dmi' + icon_state = "candy_decal_g2" + +/obj/effect/turf_decal/candy/bluewhite1 + icon = 'GainStation13/icons/turf/decals_candy.dmi' + icon_state = "candy_decal_b1" + +/obj/effect/turf_decal/candy/purplewhite1 + icon = 'GainStation13/icons/turf/decals_candy.dmi' + icon_state = "candy_decal_p1" + + /obj/structure/lollipop //ik it's not necessarily a decal but I'm lazy rn and will (hopefully) move it later name = "Lollipop tree" desc = "A mere snack for people larger than life." diff --git a/GainStation13/code/obj/structure/candylight.dm b/GainStation13/code/obj/structure/candylight.dm new file mode 100644 index 00000000..220b7073 --- /dev/null +++ b/GainStation13/code/obj/structure/candylight.dm @@ -0,0 +1,9 @@ +/obj/structure/tree/candylight //GS13 + name = "Peppermint Light" + desc = "A light source that's made out of a peppermint tree." + icon = 'GainStation13/icons/obj/gslight.dmi' + icon_state = "candylight" + max_integrity = 500 + light_color = "#a5cfc5" //testing out my copy cat skills. -Metussi + light_range = 3 + anchored = 1 diff --git a/GainStation13/icons/obj/gslight.dmi b/GainStation13/icons/obj/gslight.dmi new file mode 100644 index 0000000000000000000000000000000000000000..d82cbd0fc119b5f6353e622ecfe95822afeefdaf GIT binary patch literal 443 zcmV;s0Yv_ZP)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5DLFAOr7{O3p~S_Rl37#?6g1@GOe;#vO@*-GN^vPrR&e!m0b33L zEo&sutR+O*0002eNkl9*5JSBI@%Xkw z+_hk$-S*{ol6IW?Q?0^guALx+Igu6uf(_191g1zU;L_bf*jWJ(z*Xit-~e1{FhPn4 zXlTn)1#1B{5j_l0e88#JXUG$f6ZIC5{?Rc&ql2vkI8U$uN#FS%;2A2QML@hr4*}{r z4&yk1j5-~>1SAA*+eX#vo$z<&h>9k}P6&l)qpZ{osuf&uv3APO7AjRIY3TrEe4 lI5qmoO@jZ;zP9@_^#&rOKeli+Kvw_&002ovPDHLkV1iDWwax$l literal 0 HcmV?d00001 diff --git a/GainStation13/icons/turf/decals_candy.dmi b/GainStation13/icons/turf/decals_candy.dmi index b9cfd99e6814641cdadf7ade3cfbe36a66c23e14..029c6a0955638e2675518b181cadd0bd120e6df3 100644 GIT binary patch delta 2804 zcmV8RTZd_ z1cC^do8t=KpG>Xg;ub zc0GUI{J!t^`@P@Wr=1?lvXGG;Z>8OU^G+r}%47lrpkWwnps$ZL41>{jQs>SD@S$NC zE@S7)Wo(U)cYGd|OaLEpcos&H0;Pq>l{d#1T@IYT5qhuo{p7SPv7Y)N;d`?g$Xx@gjO?H%qpl&A~ z6=x~zsfh9T|I;xR!)I4xd7*HwjUUI-Co9UwDySi)3| zQNo^h<4ISke((n8+ag1itYa5qw&URHrAyL_$S!I-j?|!qdR?CdD*R`Ae@9`@Qd~QV z*Qf}a!|1+65&WQY?TwD2ABtgU7&dD)HhklT^dhoGRZSCvLqpQ=plRBO_?ed{Zj6mF z5}&``YCezaPo4x0L9$TBBO8WqjE%A0i3wa@UJiO007sq56G)>bNW@ajf zrIPa4!&0dg&jT1IOgxTj?5H`6#Gk!#C6ox{oz!m6sR(iIVqtJv=LtMpglS$szOawQ}Au`I-l%bh|OA! z0RV|0y9QmK!mMf#5rvKF=e>Oht9~3{Eba+72ULK^k`N0n>gT`a8;bzc#(KKzuFNb*@uOf&| zq&a|(Ye6sQl^=o2YeCEQ+Taf2&)?eyU@VD9%KWN@4|s zj8o?Ur-5$QJ3N^H3gYIopkxB1Otv&JWikO$CXfL4N^jVEmp@?lN^cl#ce`Qd1z!Q~ zmEO3F{q#`|w;pbFe4Y^vUjd#z$^igwJ=|&=KO;GO1t7zd@kx-3WbmzooBP|i_3-#T zi7-uit{aK0kLOuz80_LeA6sk~jJA`$Mo^5# zebzVdHZvOc8EtptI=&tto16J+-CZ3985NP|{Acgq(n+nwhWqQt2e~q)w_0EP-|auy zsb!;a-_@3KZV}^KcL9LS_5V51w#2H0@0H##J}0OWe>9)GY5T7ezi{2i#eqI{WN_a2 z001um78?fR_kWNp0%JSUL$@Umhr8-DCZX2#xLg<Ry~nUNdt&-dB=A+afb6aO?>(L3mGy6@vKKe@?yJD-rX@$p|~|UMtk~p;`C(OmpwZ zYpgJ5ir*F)Ufw{oJ%Ey;R}bcU>=)BNv3Gv?8>o&^LFfAH+AgmB_QTjCim+ajG-Dfg z*rluQ0C2~DF?o|1j@`tQ>r3tX?y)ROI^o8{_gE6)i|L=(q~42v{OkQt4Q}pl0{|xV ze_o{kG>VbMbV{@*T^p#VZT^$p7pmH#;p&4R*}X}O%$j8qysJEf0|Vj;^@h-o5-(z-Znn%Ph4p3Z$lQ##o~#? zXoZlE+EWz2`gAVT`gjs9Y@CiV#y_wfe0y^xP)!j8qj8_1;hvhHzmJ$%_)Dd9_?`0D z(&2Zg7hZI(jC(x4#QvcF-nFw>Oz}LcJa@(Jxa;G2_+cd<|HUyriE&^%p2JN|f73>W zW{;Pb)C$3tm(Wy1Ik$+{2mfoIe{ACpTeFo>iU$ zKq8|T89!{+IuaV+^TniWR!w{|*jk)Rb4lV{P}t=qd_^l(u$rcgT$%l_EvT$VhouL= z$m98?_DR3397=bb)O!K6Vt1H}f4+D51LijqO8l_dTAWKF$ifbZKr!``!J!_0)D(A= zA<+>5d_$BPRYEl*FGOn{Wh1W1`ofRxDuNSRE4l*t508IR`&?6QHr zcUi;OWwd>g4LdJL1!x$%!tb_yjIHq>J3h~dk5qtM`C|aU*7%QY<7adS#q$GNh9~2b zAQ{P{cz(bRxTX4S5mxixqaX66h!mb=Vvz^+&%K|0ry!tse!#SDe>*$iUsbb;LVa5C z{D9-!;1#a29MVak>1aYWEv+&tpGQP^PdM+hpH5wg9~o7m>T+PP}AnUIhAg&uqrMi%wogJ*^zi%6#_RnY$^7#R~tbtv=I_91qFkd+=y;2@~SbBv* zeY$JEK6qA<3NX<3E~EH;@cO^pgKKthbLEd6g;}@OmYxSX1d#P|8n+kf(>n64KMS?< zJFOm#PXT1cjY@|As$LHGuN+o+PKKHe0la!Spzi5jo|B=bMniz8>*KvVCqs?$S(0H- z%%>o*c$!T|~Z00aO@L_t(|ob8$+Z{si&$N!y5MhZ>?0|!Qq z4UC>j0&mg^F8u-p9iPIg;%aOfU%|e>Hn2%4G^s`h%0dDP4padn2XkQeD$lVK$9Cte z>rbjQWpU#7_j}JTwp)xbd}a20cfdD0e*t`Vz&ASqe0RV%I{|!mz&A<(R#B86b~^bg zigNn2tynw9z@|G6N^0P;OeTS>WC`r0OV!uY>|4vC{24wmVy7x;uxbef9=Wc z=R02(E@e5yH0*4>rltBC41(ZHyv7)Nl664Vo;OHDHlnL2%2gt$Jb?E)-8Lf95CG)H z)}>DJGzmL0*d|#k1<)nQGW_`VZQUV4OrF%aB+H}*jncGt2|V)GmjAP|#7(A4`HDZoea<@W`gd=1(V1cBH0e|Zns37~V+HgA(v z3b5_lWR(JJ`!-pn0KT@#K8ng|&}6;-Gf^pkiZb~INB2D*W+~{ z;au)2+t9k6OsvlM=&a%MNY?Y~G