From 14cd7d0f3d229f9c4fcc5f961fed3ef8f0690926 Mon Sep 17 00:00:00 2001 From: Penelope Haze Date: Sun, 22 Dec 2024 19:44:07 -0500 Subject: [PATCH] Add covered wells --- code/game/objects/structures/well.dm | 7 +++++++ icons/obj/structures/well.dmi | Bin 1279 -> 2021 bytes 2 files changed, 7 insertions(+) diff --git a/code/game/objects/structures/well.dm b/code/game/objects/structures/well.dm index 10c34059fea..1b2039aa77e 100644 --- a/code/game/objects/structures/well.dm +++ b/code/game/objects/structures/well.dm @@ -32,6 +32,10 @@ . = ..() if(reagents?.total_volume) add_overlay(overlay_image(icon, "[icon_state]-fluid", reagents.get_color(), (RESET_COLOR | RESET_ALPHA))) + if(istype(reinf_material)) // reinf_material -> roof and posts, at this point in time + var/image/roof_image = overlay_image(icon, "[icon_state]-roof", reinf_material.color, RESET_COLOR | RESET_ALPHA | KEEP_APART) + roof_image.pixel_y = 16 // we have to use 32x32 sprites but want this to be, effectively, 48x32 + add_overlay(roof_image) /obj/structure/reagent_dispensers/well/on_reagent_change() if(!(. = ..())) @@ -64,6 +68,9 @@ /obj/structure/reagent_dispensers/well/mapped auto_refill = /decl/material/liquid/water +/obj/structure/reagent_dispensers/well/mapped/covered + reinf_material = /decl/material/solid/organic/wood/walnut + /obj/structure/reagent_dispensers/well/wall_fountain name = "wall fountain" desc = "An intricately-constructed fountain set into a wall." diff --git a/icons/obj/structures/well.dmi b/icons/obj/structures/well.dmi index 33a27086c184cfaa2fdc1555d80edb09aada4c59..9a6402de82652553c919d3ce3359b4ca0239161c 100644 GIT binary patch delta 2020 zcmVV=-0C=2JR&a84 z_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex7wuvIWN;^NFm%}mcIfpCgT5=&AQY!#Hs z^NVs)l(;xkGK-28Y!wW-IMa#}b5kK~R8_iZIi;Dzsx8PbE`KQ|Qf*Owei|;N$_lQ2 zE($Kbo?HNCc0muY+L+b=00$aLL_t(|ob6gsNE}BP{!V;|)rSx{F76&xPL8|8JV~N? zv!0NclRT7yd1$Rk8!CO02of4XVxSl#5b&v7Nhvn;MaYwQHUUr5zC;u5B{_3)^vH(0 z4aZ@*2gN+J*?&H4W}KaySv}3U+a@0@w>vvKGv7D=|Ia_8p2fvQyw9j{dH_!2g8)ts zz-heq0@POe!SZs}kiF~Z2zd53oc+hP0`P?U`y*&>ZZ4~*X&R=d6PCLF1wlNrWsndT z5!N)#QpP`%vgzpr0Cx*fCV+@IOYoboFH0Ny@u!Kh`hRX0!Xm)(a@H6fy+EHeO~bcC zSK(I`S{4k4kx8c!42NkMdCsKMv@Dm`@k8u;i)Gxp^|R|lpsT?0a@OeYk3iEj06?^N z0OtoU!LKR^hQk)Z04Q0OGyq!HuPQh{cnQ(o0RX0${rwT!AnF7xL6FQ=w0D3K=Lr(9 zmLRJW?SDIqOgfEd?*QVz-F+tm?&|7#B767n;ltyVw&z(~T(p>ew08jAJrN-(maIqs znHa%v7z^_WDncc$ARvdrPlkPF%Sj9nSpsQ4lYdU5qa$ETo`@wP`*E{R_$w2otE=mY zOoZBrn|BO0%6IofurQyXF@PtS%j?2HlQu-6EzBp--4n6YpSXF)xcuEkp&R`1`?8dz zjO+2gdQUk!kd;+<=4!^2cNN>L05H=(dhLm;pL_k)U^>y+0EZ!KK$6soN zCx4ZYu@mEsu_<){&zaL-7=Ss0!y|)eYdZ?S3{-$Agp9Nu>JHS?StkKDm0H2%?I|jZ z%mP@{c>O_C#VI?SzldCni7osl*c?K^9E9v!^^P1BG{tpETe zzxjFtbqDHqMZ!*yoe<_>$peT805CiR>jI!{u(Q4!cd908`GJvDfcWp^?I{}3qtQ+PR+21IsTE3^ z&kv$~XQ}(RNeF5I#3$pkGYGZ@%Lo8lGg=8U=`{SRg81yrj{SZ=Q3F_)wqR=zxqrNF zNoF$Xw3*YtwSbeIZHPuY>2E+$JH9op8M`s;A#tGYKs|!3LBwZggsJTC$RHjqrEsXR z0f!nJ0D#^Rb~I`V+csW1Ti`b*q$d?gZu2k!!(e;IWhX%@Bu@PFV15y9<* zc~m68{}CVlHV6Q-4;~wRr%rhI`*#UhALHZWjvbRefkst zaQN`yvif|Ps1A$z`g%+I2Y(M9r0=KzEv-t`McA&7Y&Hu3l)RqH?YU3I@5jc5eDh_o zfRc=ZZ;E(gW$ z2e2h@Ah2~LZ&?MLa)WF(i{e{9E;9b?YicSZO|Z7MX4WqjEf%hzMS<7hbQ|LYjX^E`nmQNbB3d6?uTjGy&6uS%_xY4*d5bRQx|e)j+9K z0s!2fn?o=ZLS}Upir)`Cmy?np<=c@Y?T~ia{s5P)0;kWMfvT!FckUcwu^6siy9Qmi zACsb(F2&X(WdJPg1b+en+@G7XeD8`pfQ6zclnhHMpU*>8Rpj&eZNKG3({&w+q6oir zl?AZTxmYOB0jsJCRaNOdTh2n)^)iyAoqRrTX`jFqF@P*lrBVsWWD>Yq4Du?<47n(pS?TS%I+4d?>}E%wVnq!iRW(<6#jlc;J5_<<_S@# z#XO3yRveP`;a!To0N~t4%ryd#C33&}aE$V=-0C=2r$~g*v zFcd}6I)4=ptre#>jYK4c?mZwx_t{P3%h&aq-eWdk5GfA%lg2_4v8i&NZf3q zgG61CaF!Pr-wAPw781#Q_|+sN4Eq3ylEmz%&A$Cr*}R_oYkyO8qkf z%m4rcLPu`aiCyKz@Sq}a4CxE#gLQG(u-xez1YInH4CDK4U!;-_9Ww+vOR47WM(w8v79#A zCV3!MGyC`Nyni?U|CyawyWPgSjHyWvVA6Omz@!H-X}t3S#K(Q0(>e8Z_ZAng#a?eX zZyv7{Kqg!&74p&Yqwe3^E`a}&G$$p6MwAFFimt_7lvuFK5BPem-Y4f z1N`{#2O%;ZJoq_sBCu7U(>e7^r93>(0{~dXGHzAwAeBtOFin9l07jN44S?CEk_p_Z z+<{dr0|>+{mGYrQbP^DXAkCIlEHmOVK>{BMIvZ5)b?09ha5kGg*4;Ze zIJiEpzkgV}-4;UMDwdHe|Vi=~0{k;|wVVqP@5vCd=Uu9fG5EcOx`tra5 z2stnJ$@M_);{{Q@LkA+RBKy>P1^^>h*^YdK2@!ue$kFAFpIMm<-{$+N2B;!|{C8a! zi;LGn$&*+rvLDWWpuFlt$!4?1IuYWV8{0l#<$rU9JofimtOm#gd;NiO(BwlU+WuY( zxk6sB-`v>t?|%1{G7WzJt)nHWBYP1$r2zD2I6PyO8UXh9TIlr$NF@^j>GS7jN=GVT zs4rK@gI1W~Q2jiQ7ykM6r{1&Uama*;@xnjXra%KrpMl{s6VDI;yJ`0Qx<@-E3%` zS<5Rzdu{DDJkNvUoB#kLfByUoGt;w|A`vFYMF`6f_5maU0902iaGVpZ5Gu&KNS-+P ze_dRLWEcbiC=zmoJZ$?20AN`eMr3YoHh=VM5CF3Uzkov@OxJaTJ^eosu#`!|vNG(qlt}{!B7|(|Im0vqe+veCM^t7X0Dod1 zXK(s)NXpfm-}aU(pK6`$)SoD~$AGwc(EHZ!S10~yJhgtm8lyTeGd&Aq!GPUtD7UiJ z)d~)e99+3Nhbvd-0D%2JJaX6)%A@PLEUoArQ6Ud-2O{hDYCh#C6+qRuKBWNw{PpLM z2>}E(LiG#~Y^VT4iaa2l2yJd``*HFrz+)+s#!mf-G7YHz@W>gtNB-<)BU0o6#hKvx zy_!!2OU`2;D0K47Q(Lu4u!8tUH*(~GkW*m*_~o%J9ABvfks+tRXJ1&6Bh4dJ02#6% iDny;IjIjiG8}T