From acbb3f3835155fb8e8a6c8f6e0cca7d3ff33eb87 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 19 Apr 2020 16:52:54 -0400 Subject: [PATCH] Oh I forgot to fix up the dispenser too --- .../dispenser/cartridge_presets_vr.dm | 9 ++++- .../dispenser/dispenser_presets_vr.dm | 36 ++++++++++++++++++- maps/tether/submaps/om_ships/shelter_6.dmm | 4 +-- 3 files changed, 44 insertions(+), 5 deletions(-) diff --git a/code/modules/reagents/dispenser/cartridge_presets_vr.dm b/code/modules/reagents/dispenser/cartridge_presets_vr.dm index ebec2278a0..50c3f6d399 100644 --- a/code/modules/reagents/dispenser/cartridge_presets_vr.dm +++ b/code/modules/reagents/dispenser/cartridge_presets_vr.dm @@ -7,4 +7,11 @@ //Biochem nutriment spawn_reagent = "nutriment" - protein spawn_reagent = "protein" \ No newline at end of file + protein spawn_reagent = "protein" + + //Special Ops + biomass spawn_reagent = "biomass" + carthatoline spawn_reagent = "carthatoline" + corophizine spawn_reagent = "corophizine" + myelamine spawn_reagent = "myelamine" + osteodaxon spawn_reagent = "osteodaxon" \ 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 bf7f85688d..ed63a60768 100644 --- a/code/modules/reagents/dispenser/dispenser_presets_vr.dm +++ b/code/modules/reagents/dispenser/dispenser_presets_vr.dm @@ -30,4 +30,38 @@ /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 + ) + +/obj/machinery/chemical_dispenser/ert/specialops + spawn_cartridges = list( + /obj/item/weapon/reagent_containers/chem_disp_cartridge/inaprov, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/dylovene, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/ryetalyn, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/tramadol, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/oxycodone, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/sterilizine, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/leporazine, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/kelotane, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/dermaline, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/dexalin, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/dexalin_p, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/synaptizine, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/hyronalin, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/arithrazine, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/alkysine, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/imidazoline, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/peridaxon, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/bicaridine, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/hyperzine, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/rezadone, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/spaceacillin, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/ethylredox, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/carthatoline, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/corophizine, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/myelamine, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/osteodaxon, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/biomass, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/iron, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/nutriment, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/protein + ) diff --git a/maps/tether/submaps/om_ships/shelter_6.dmm b/maps/tether/submaps/om_ships/shelter_6.dmm index 32ba8090d5..7216f3a01d 100644 --- a/maps/tether/submaps/om_ships/shelter_6.dmm +++ b/maps/tether/submaps/om_ships/shelter_6.dmm @@ -1044,9 +1044,7 @@ }, /area/shuttle/tabiranth) "aU" = ( -/obj/machinery/chemical_dispenser/ert{ - dispense_reagents = list("inaprovaline","ryetalyn","paracetamol","tramadol","oxycodone","sterilizine","leporazine","kelotane","dermaline","dexalin","dexalinp","tricordrazine","anti_toxin","synaptizine","hyronalin","arithrazine","alkysine","imidazoline","peridaxon","bicaridine","hyperzine","rezadone","spaceacillin","ethylredoxrazine","stoxin","glucose","cryoxadone","clonexadone") - }, +/obj/machinery/chemical_dispenser/ert/specialops, /obj/structure/table/survival_pod, /obj/item/weapon/reagent_containers/glass/beaker/large, /turf/simulated/floor/tiled/white,