From a1081d80123ab1969da7afd51c933d8b4e484b5c Mon Sep 17 00:00:00 2001 From: Heroman Date: Wed, 19 Feb 2020 16:07:59 +1000 Subject: [PATCH] Adds biochemical dispenser to medical's chemistry --- .../dispenser/cartridge_presets_vr.dm | 6 +- .../dispenser/dispenser_presets_vr.dm | 19 +++++++ icons/obj/chemical_vr.dmi | Bin 2199 -> 3149 bytes maps/tether/tether-03-surface3.dmm | 37 ++++++------ maps/tether/tether-07-station3.dmm | 53 +++++++++--------- 5 files changed, 70 insertions(+), 45 deletions(-) diff --git a/code/modules/reagents/dispenser/cartridge_presets_vr.dm b/code/modules/reagents/dispenser/cartridge_presets_vr.dm index 37d7514f03..ebec2278a0 100644 --- a/code/modules/reagents/dispenser/cartridge_presets_vr.dm +++ b/code/modules/reagents/dispenser/cartridge_presets_vr.dm @@ -3,4 +3,8 @@ ammonia spawn_reagent = "ammonia" diethylamine spawn_reagent = "diethylamine" plantbgone spawn_reagent = "plantbgone" - mutagen spawn_reagent = "mutagen" \ No newline at end of file + mutagen spawn_reagent = "mutagen" + + //Biochem + nutriment spawn_reagent = "nutriment" + protein spawn_reagent = "protein" \ No newline at end of file diff --git a/code/modules/reagents/dispenser/dispenser_presets_vr.dm b/code/modules/reagents/dispenser/dispenser_presets_vr.dm index be95daa438..3a3d0031ff 100644 --- a/code/modules/reagents/dispenser/dispenser_presets_vr.dm +++ b/code/modules/reagents/dispenser/dispenser_presets_vr.dm @@ -1,5 +1,8 @@ /obj/machinery/chemical_dispenser/xenoflora name = "xenoflora chem dispenser" + icon = 'icons/obj/chemical_vr.dmi' + icon_state = "dispenser-small-green" + ui_title = "Xenoflora Chemical Dispenser" dispense_reagents = list( "water", "sugar", "ethanol", "radium", "ammonia", "diethylamine", "plantbgone", "mutagen", "calcium" ) @@ -15,4 +18,20 @@ /obj/item/weapon/reagent_containers/chem_disp_cartridge/plantbgone, /obj/item/weapon/reagent_containers/chem_disp_cartridge/mutagen, /obj/item/weapon/reagent_containers/chem_disp_cartridge/calcium + ) + +/obj/machinery/chemical_dispenser/biochemistry + name = "bioproduct dispenser" + icon = 'icons/obj/chemical_vr.dmi' + icon_state = "dispenser-small" + ui_title = "Bioproduct Dispenser" + dispense_reagents = list( + "nutriment", "protein", "milk" + ) + +/obj/machinery/chemical_dispenser/biochemistry/full + spawn_cartridges = list( + /obj/item/weapon/reagent_containers/chem_disp_cartridge/nutriment, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/protein, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/milk ) \ No newline at end of file diff --git a/icons/obj/chemical_vr.dmi b/icons/obj/chemical_vr.dmi index 19589b33880766b232949e2b6bce82ba44dfbef4..973be492af55795e897f0aae7e1829a87c8bde67 100644 GIT binary patch literal 3149 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 Q{11SUfth~!d6(P&229Tt=>Px# literal 2199 zcmai0c~sK*7XKk4Cb&kLTbPy$<&s&UQ$nQ~?z!ifn&ynQpedOP3FXTamwZXjG!-&U z91U@%(ySEAjZz6qbIB!?Y+O+Am7*v^|Gf9kna+8CeD6K?dp`Gjx6k>Wo8|54qN<{& z0sw$2?zoeWT$8^aWhJ?M<#_syTotGI1reO05+dVc;s`OZcmPN$@ePQJzqI^s-#F3N zDU_Qfs<)f#%ksD3?VaH7=DJ&OyyeDzKEL~Tk2}}=Y8=H)%gtxY`7PA=y}Nv};nYU7 zuWdF(egS`qen-(t@ZEmiFDhg3_Q|-54=O(I2tW;@w*E=S63+3L#4zz2-|Wmsd42+1 zn}r?wq4&wwey($C`-cJ;0L=-V;PtJ*007#Eb2{voR5D*$A3Jgk(Sd>BG=h%hI}5{q z`9k&kqJ>V^3Q~S?<_q;OWcb#of(waE1}v`)DC-%KGxGBCEqyfTdcSvME80Y(2fHE| zT~zqY+p}@oyD|#Y=E9L~yb6NLHfP>)bGvr()WUJcF+(pREq)ZQv*Xew(|MKrzWyP! z{%n)bX^1&8|Ct|`Wqp&DJq-EMBn)|x;vapN7yXa47E-xZo7YXG1>pXUU=`N9`}yeD zSQ)hdOH3wyvSQnLRQaJcy?W7S*Yi+O^iBYSkah4QPc$C+p-v|!>!zlr9vRWZoJ^}Y zY?MwyjSEnuu@se&Cz=Q1v#e=Ii3Pb;Hb5#4!dE}L>LqxFjy;r1F;2Ti6atKZ8nbQo z4_Z$aRSG-WY*$;_$3YW?=dRc1i8>p=szB3p%7H8zoOaHb5&Y2MJ})*2zF+4=JOdpH##3?L%&) zUzqy1+I@@LHnYbqEyyrQ^3jsb=Nl`m-Ae`OL-)Z9f?p^aO{v}K7|*EM<$9I-DA$0A z$r^)D#0?7&cT*LEmbZR3cQaWR?yl)l|9t)xQR%bk*|TRtLInv$&CMv1rkn8JOvAWf z7EYNr9b8t;rSoh=1p*ipTkZEU4&BzCt+U5Kt^V=j>#mi2W^BWV@YmRFtx&CsuF>w{1)>6w-K&`psZ9yR^1 z!R+<5)>XtFaIuz^QnYTf@B%2{_sh$fdzt{Bddba^&8R{%Vro?Gx*&PS&!J1HyT zm6ss;Y||vEk~3b*;vSCTJF01hS%t0KX3J2Z_DtC;^-IVqlC?WSxTy4qgdl+(Ob2GJip&X&$K-mRUgS zMVJL{*h#>1&m}f{zcYdm0oT}xDHBxuaqyBD+Qq#wKt1!iBK$b%{lau-hvE@S?C=H< zD*2i0-R$J-uz`>W_H7Qh0@BX27Q2E4!#w>@a*Huq^qK&sr!p@u1(=~RrKjLBeG9iy zRpQrqu32K!`%!k?oUGda4%24i5$|zkxdCaISo2OXpksNm7gh@dK+Qk62bIPNLnPqE zOp!CKCTe=Rsz*JQxjeg`edDd^;(uuN_xb#Qi$4a1)I+actej05_V*5!Go{gXUL8xR z>jG(*VGi{kMB|vo5OPd$Z?66UW6;nU2&9#0p0EMzc>0=(0dUO`5^z_Smsw>^S335j z