From 6437fe3f13b869900632aff7b387ee91ebc174e2 Mon Sep 17 00:00:00 2001 From: DreamySkrell <107256943+DreamySkrell@users.noreply.github.com> Date: Mon, 4 Mar 2024 10:25:35 +0100 Subject: [PATCH] Supply and scrubber pipe connectors and pumps (#18571) * a * 4 * 45 * 6 --------- Co-authored-by: DreamySkrell <> --- .../components/binary_devices/pump.dm | 20 ++++++++++++++++++ .../components/portables_connector.dm | 10 +++++++++ .../DreamySkrell-more-pipe-stuff.yml | 8 +++++++ icons/atmos/connector.dmi | Bin 1237 -> 1732 bytes icons/atmos/pump.dmi | Bin 3778 -> 5930 bytes 5 files changed, 38 insertions(+) create mode 100644 html/changelogs/DreamySkrell-more-pipe-stuff.yml diff --git a/code/modules/atmospherics/components/binary_devices/pump.dm b/code/modules/atmospherics/components/binary_devices/pump.dm index 41798ebecd1..1f8ab600d67 100644 --- a/code/modules/atmospherics/components/binary_devices/pump.dm +++ b/code/modules/atmospherics/components/binary_devices/pump.dm @@ -66,6 +66,26 @@ Thus, the two variables affect pump operation are set in New(): icon_state = "map_on-aux" use_power = POWER_USE_IDLE +/obj/machinery/atmospherics/binary/pump/supply + icon_state = "map_off-supply" + base_icon = "pump-supply" + icon_connect_type = "-supply" + connect_types = CONNECT_TYPE_SUPPLY + +/obj/machinery/atmospherics/binary/pump/supply/on + icon_state = "map_on-supply" + use_power = POWER_USE_IDLE + +/obj/machinery/atmospherics/binary/pump/scrubber + icon_state = "map_off-scrubber" + base_icon = "pump-scrubber" + icon_connect_type = "-scrubber" + connect_types = CONNECT_TYPE_SCRUBBER + +/obj/machinery/atmospherics/binary/pump/scrubber/on + icon_state = "map_on-scrubber" + use_power = POWER_USE_IDLE + /obj/machinery/atmospherics/binary/pump/update_icon() if(!powered()) diff --git a/code/modules/atmospherics/components/portables_connector.dm b/code/modules/atmospherics/components/portables_connector.dm index 4724b8892ae..a78073b6809 100644 --- a/code/modules/atmospherics/components/portables_connector.dm +++ b/code/modules/atmospherics/components/portables_connector.dm @@ -27,6 +27,16 @@ icon_connect_type = "-aux" connect_types = CONNECT_TYPE_AUX +/obj/machinery/atmospherics/portables_connector/supply + icon_state = "map_connector-supply" + icon_connect_type = "-supply" + connect_types = CONNECT_TYPE_SUPPLY + +/obj/machinery/atmospherics/portables_connector/scrubber + icon_state = "map_connector-scrubber" + icon_connect_type = "-scrubber" + connect_types = CONNECT_TYPE_SCRUBBER + /obj/machinery/atmospherics/portables_connector/Initialize() initialize_directions = dir diff --git a/html/changelogs/DreamySkrell-more-pipe-stuff.yml b/html/changelogs/DreamySkrell-more-pipe-stuff.yml new file mode 100644 index 00000000000..5c27c6a385d --- /dev/null +++ b/html/changelogs/DreamySkrell-more-pipe-stuff.yml @@ -0,0 +1,8 @@ + +author: DreamySkrell + +delete-after: True + +changes: + - rscadd: "Adds atmos connectors for supply and scrubber pipes." + - rscadd: "Adds pumps for supply and scrubber pipes." diff --git a/icons/atmos/connector.dmi b/icons/atmos/connector.dmi index bb7c007d8ee24f4df0a701862d24211512d38278..55422369809ad0449dab03e632599213d30bb47f 100644 GIT binary patch delta 1625 zcmV-f2B!Jd3B(P5iBL{Q4GJ0x0000DNk~Le0002s0002M2m=5B04iUf2&uT2PQvNunJ@YC_VGTvVErluBYm5Y(ou;OgfBP8tAv0;e2^ z22ue400nAEL_t(|ob6qUcB(KCydW5a7E@nU`~UxW4c1m*WeJ<-Hgl|=(=m_f(U{qh z^xwajkmakQ^gRii_yYphg1NwI!&+dSH@sh>b^f+g;D7rN+;}m>JHWTw?*1i@wWspS z$G<&6_A%<9`|XFq1dp|+@{7k;Pw43fI#9pfDNOKKdn&(p{O$?+Uw|FN%-^5zqyI$* z5%cB;Xa{`jSYT^c;O=9@f9xCzRO6R-@D*4T#YPl@ufXQ5sn)BCuRxhANLvGJ2mIEt z!0r2?u79&EJK7n5{VEz9?|rA?WG5pc-fPa;i$?7hX1EE3c>Nyg2mL#4%X}a>$UX0} zU@e)~Jx`wvZ-KSk^DgWjWy4$GDX)0HMA@fDOOf8Yu_L{AV@DF`f45KLvm9-2!q2s~ z{o+eL!^WTCn9pbR>+|DbT=(p}_-h_(PvSFd{C^oWk8_U)1b$ajUh!CaDnC8GfvVQW z&Tmz1dVG3avfa6?Tx*Z-zVhsjzo%%9!x5Lf5Sz_yQAGuwdmTWFK%jh8HT!1GSfKjY z_>_zV9*@WRR6EY^Jfur}SJ9arnEjmF?M4A9(m!#0*EGAz2>baNZ@q; zw14quxCw)9L3O3qe@z|Vt>0_4`#)00_wC3rzLwPf1IIBHb|XhB?8XlE0#kOMkdTm& zU>9M#2?M;2pR?r$m-|KB57P6y%S92F$HNp4I(m%1JNjAu1H6HJ?$YCd3H*{^O$Oup zHJQo&0p3A=hgH?6RkyIN9~{?3sdZCw;eR)B-una`2&ASvmmUu-0zUa9kb%Ik-$QAU z(G*Di9Kt^5oPW-m-br9P73Vu8D8DP8f#-7?drhIgm!$4>q5Q58_pi`w)IFZhX}E<2 zZeW31DF;t@!rhOps_rW^Rio~;{21oMa8cqV^Mp}hp2f7NCW4M~zLX39f1A*h+ zx)6oBsk6&&jxjhlG2{_H1@P+7vfHiu(esNi|9qH?aleQzkN zKaL>o10{U#_O0`Q`?+7fo4~f!&jhZnqjOk=vegar2VyUy=!6YTMT zzz5Y$0}%M!d{oj1t!hTEx@{qWKYsx4bx-4U)6gcE1TGNhH{Mc<#4`^qG8#O4fzUs9 z^PArp7ijrC2wwZd=}QQ^-hZ`ELKGYYeqa04>~D{&Fa(;-@1C!H%6)$m%0_YB%mDkU8T+~?`^q(Yf$YK3(9}Y1IoXN=;V9$O7HgE#b1_MEe*8Y88fK6sT3& zH!hHx?##&VCc_yEtEe<7Ks&#~#-|Gujs+qwaq9v@%ixp1B+zm`N6z=?0*&r9DSKIv zHzClZTUhKy?70asggRTlXWb8ackH$uy#@lUxtIh0su}ybC;Q4Zdx7lJBhh?D^d9^V X`a+q~%xCeY00000NkvXXu0mjfHLNQh delta 1126 zcmV-s1eyE94b=&MiBL{Q4GJ0x0000DNk~Le0001>0001>2m=5B0K5^G9{>OVQBX`& zMZmzo6B84IgM%g}CSzk`US3`^Gc!X&L%6uO85tQLA0HYT8nv~x9UUEFVq&+qw}ys> z8yg#0Sy{BSv>Y59va+&?iHW(nxd5s9#gqWRz`*XK-^>6I0004WQchCV$;9>lY~``Y@}A>3BNy+gNJF&K=`zPX9~?5qbXuY)1TsmcVQ`;ddDe zWPxuLxE=9ZS^~+R#ewEQ>MKbSajk{MkM35W@uT}aXnX>W8Q_WFknWRXY!N1i^h8_W z`75U_P^9~Uw7^T6(-wFxE81^yU4A!4fnbB!Sb#v{^H5z@w9g_@=Ct2pQT|XB7~8FX zfIJ01xS8kQ;Ha-x`SSJeX<9d{k>~g~)FjsduMyaetmmUwZ7O*noeyp@WAYF^Iq;n< z$Z+WR3~V?QLSWN0Mbg}VDvJB001CVg`k$U8X8sj{`A=S*zN@Or_xXvUz_gT5lipWK zPvCZa5TdT@%N^n@u=$_=_>K5k?0uepBajc8R|?yFu!H}#*u2(4YxNuQKeJnb+)i}A z2ksZgcgz6KU@#cV24~M$EI)gWjsGAptQ)CIbpK)fV2$>JaDIp4YY&bZ%I~l|z9ykx z)zPnuLkc9HEZ_y=(x=dTbOE0rko;$GSpu_c5>Nv37;>J2#vjk*`fE@Ft`yLJ_`|jE zzG~_On%7d?TB{kq-GS*F^lm~L54U_zVBLyl{B{ebYw!f++nn;f3)b&x#&5S^x)vzM zD^l-{yxoFHS6*=OU6^-UFb6;Vabb?df2e!Ig0DSgFc`~+cQ@jjckyd>e$JgYUq1*r z-rG$Qx4$P7uXW@Q|8V4U{ae(347UNV5!jR3ng-&BHH}7~*L+YT09Q5oF1)98HL~uG zo*aBa^Z}($w*jv^NkZ~0(1SqopF!#Z-SRzXo(u68bjtUjl>)mGJ@fr_(B^#4VXaMo zwc3qO3Yo&e`JRJYf!vN8U*$4|bISK1zXu)f#zxMEhM}U_%-O2mzpw-U*wOK;z;iX+yDRo07*qoM6N<$f*{H#KL7v# diff --git a/icons/atmos/pump.dmi b/icons/atmos/pump.dmi index 06194547ab8aee46274e03a804e3e53f4087cffa..318b7d70888556439c48609e6d5ababa05e24f7d 100644 GIT binary patch literal 5930 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 H_{9AW=KjN<