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 19589b3388..973be492af 100644 Binary files a/icons/obj/chemical_vr.dmi and b/icons/obj/chemical_vr.dmi differ diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 4d89ecd4d3..54cf45093d 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -27150,6 +27150,10 @@ /obj/machinery/light{ dir = 1 }, +/obj/item/weapon/reagent_containers/spray/cleaner{ + desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; + name = "Chemistry Cleaner" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) "aTe" = ( @@ -27944,6 +27948,17 @@ /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/shuttle_pad) "aUv" = ( +/obj/structure/table/reinforced, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 8 + }, +/obj/machinery/chemical_dispenser/biochemistry/full, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/chemistry) +"aUw" = ( /obj/structure/shuttle/engine/propulsion, /turf/simulated/floor/reinforced, /turf/simulated/shuttle/plating/carry, @@ -28006,20 +28021,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) -"aUC" = ( -/obj/structure/table/reinforced, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 8 - }, -/obj/item/weapon/reagent_containers/spray/cleaner{ - desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; - name = "Chemistry Cleaner" - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/chemistry) "aUD" = ( /obj/structure/table/reinforced, /obj/item/weapon/reagent_containers/glass/beaker/large, @@ -45109,7 +45110,7 @@ ahO aSP aSZ aTn -aUC +aUv aUJ aUP aUY @@ -45597,7 +45598,7 @@ aNk aNl aNJ aNP -aUv +aUw aKU abg aOk @@ -45739,7 +45740,7 @@ aNl aNl aNK aNP -aUv +aUw aKU abg aOk @@ -45881,7 +45882,7 @@ aNm aNl aNK aNP -aUv +aUw aKU abg aOk diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 93611024bf..d4607854bd 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -16994,19 +16994,10 @@ /turf/simulated/floor/tiled/white, /area/medical/chemistry) "An" = ( -/obj/structure/table/reinforced, -/obj/item/weapon/storage/box/beakers, -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/medical/chemistry) +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/floor/reinforced, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/excursion/tether) "Ao" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -17984,6 +17975,16 @@ /area/medical/chemistry) "BF" = ( /obj/structure/table/reinforced, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/machinery/chemical_dispenser/biochemistry/full, /turf/simulated/floor/tiled/white, /area/medical/chemistry) "BG" = ( @@ -29551,10 +29552,10 @@ /turf/simulated/floor/outdoors/grass/forest, /area/quartermaster/qm) "Vm" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/floor/reinforced, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/excursion/tether) +/obj/structure/table/reinforced, +/obj/item/weapon/storage/box/beakers, +/turf/simulated/floor/tiled/white, +/area/medical/chemistry) "Vn" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -38028,8 +38029,8 @@ Ah Bt Cc yI -An BF +Vm Do Eh Fb @@ -41407,7 +41408,7 @@ Zy WG dj XA -Vm +An ms Oz be @@ -41549,7 +41550,7 @@ UJ Xb dj XN -Vm +An ms Xq be @@ -41691,7 +41692,7 @@ iW WS dj XN -Vm +An ms Xq be @@ -41974,7 +41975,7 @@ jZ WR Xo XN -Vm +An cK ms Xq @@ -42542,7 +42543,7 @@ ea kx dj XN -Vm +An cK ms mq @@ -42827,7 +42828,7 @@ kQ TG dj XN -Vm +An ms mq be @@ -42969,7 +42970,7 @@ kR Vd dj XN -Vm +An ms QL be @@ -43111,7 +43112,7 @@ ZE ZB dj XB -Vm +An ms Sq be