From 0688e9d3a1f66df65db8e55245e2c6480b676c08 Mon Sep 17 00:00:00 2001 From: Aylong Date: Thu, 18 Apr 2024 22:40:40 +0300 Subject: [PATCH] Remove Botanical Dispenser and add items on maps --- _maps/map_files220/generic/centcomm.dmm | 2 +- _maps/map_files220/stations/boxstation.dmm | 10 ++++- _maps/map_files220/stations/deltastation.dmm | 22 ++++++++-- _maps/map_files220/stations/metastation.dmm | 8 +++- modular_ss220/hydroponics/code/dispenser.dm | 45 -------------------- modular_ss220/hydroponics/hydroponics.dme | 1 - 6 files changed, 35 insertions(+), 53 deletions(-) delete mode 100644 modular_ss220/hydroponics/code/dispenser.dm diff --git a/_maps/map_files220/generic/centcomm.dmm b/_maps/map_files220/generic/centcomm.dmm index 2f1c97b030e7..53e627e5e73a 100644 --- a/_maps/map_files220/generic/centcomm.dmm +++ b/_maps/map_files220/generic/centcomm.dmm @@ -30095,7 +30095,7 @@ /turf/simulated/floor/carpet/black, /area/centcom/ss220/general) "uRC" = ( -/obj/machinery/chem_dispenser/botanical/upgraded, +/obj/machinery/chem_dispenser/upgraded, /turf/simulated/floor/wood/fancy/oak, /area/centcom/ss220/evac) "uRG" = ( diff --git a/_maps/map_files220/stations/boxstation.dmm b/_maps/map_files220/stations/boxstation.dmm index 31adba32f197..979a34eca967 100644 --- a/_maps/map_files220/stations/boxstation.dmm +++ b/_maps/map_files220/stations/boxstation.dmm @@ -14847,6 +14847,9 @@ /obj/item/plant_analyzer, /obj/item/radio/intercom/directional/east, /obj/machinery/light_switch/south, +/obj/item/storage/bag/plants/seed_sorting_tray{ + pixel_y = 20 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "green" @@ -15042,6 +15045,10 @@ pixel_x = -4 }, /obj/machinery/light/directional/east, +/obj/item/reagent_containers/glass/bottle/nutrient/mut{ + pixel_x = 1; + pixel_y = 6 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "green" @@ -71680,7 +71687,7 @@ /area/station/medical/chemistry) "nnj" = ( /obj/effect/turf_decal/delivery/green, -/obj/machinery/chem_dispenser/botanical, +/obj/machinery/chem_dispenser, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -86588,6 +86595,7 @@ /obj/item/shovel/spade, /obj/item/shovel/spade, /obj/item/plant_analyzer, +/obj/item/storage/bag/plants/seed_sorting_tray, /turf/simulated/floor/grass, /area/station/security/permabrig) "sFQ" = ( diff --git a/_maps/map_files220/stations/deltastation.dmm b/_maps/map_files220/stations/deltastation.dmm index 2f033bf073da..b2d45d24c6c4 100644 --- a/_maps/map_files220/stations/deltastation.dmm +++ b/_maps/map_files220/stations/deltastation.dmm @@ -86431,7 +86431,7 @@ /area/station/hallway/secondary/exit) "pYO" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/chem_dispenser/botanical, +/obj/machinery/chem_dispenser, /obj/machinery/requests_console{ department = "Hydroponics"; departmentType = 2; @@ -98063,10 +98063,23 @@ "tGh" = ( /obj/effect/turf_decal/delivery/hollow, /obj/structure/table, -/obj/item/reagent_containers/spray/plantbgone, -/obj/item/reagent_containers/spray/plantbgone, -/obj/item/reagent_containers/spray/plantbgone, /obj/machinery/firealarm/directional/east, +/obj/item/reagent_containers/glass/bottle/nutrient/mut{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/item/reagent_containers/spray/plantbgone{ + pixel_y = 10; + pixel_x = 6 + }, +/obj/item/reagent_containers/spray/plantbgone{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/item/reagent_containers/spray/plantbgone{ + pixel_x = 6; + pixel_y = -2 + }, /turf/simulated/floor/plasteel/dark, /area/station/service/hydroponics) "tGN" = ( @@ -102880,6 +102893,7 @@ d2 = 8; icon_state = "1-8" }, +/obj/item/storage/bag/plants/seed_sorting_tray, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "vhM" = ( diff --git a/_maps/map_files220/stations/metastation.dmm b/_maps/map_files220/stations/metastation.dmm index 3b0ee6673eff..20bc7dbd29e1 100644 --- a/_maps/map_files220/stations/metastation.dmm +++ b/_maps/map_files220/stations/metastation.dmm @@ -22198,6 +22198,11 @@ }, /obj/item/reagent_containers/glass/bottle/nutrient/ez, /obj/item/reagent_containers/spray/plantbgone, +/obj/item/storage/bag/plants/seed_sorting_tray, +/obj/item/reagent_containers/glass/bottle/nutrient/mut{ + pixel_x = -4; + pixel_y = 2 + }, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/garden) "bBN" = ( @@ -29901,7 +29906,7 @@ "cbP" = ( /obj/effect/turf_decal/delivery/hollow, /obj/effect/decal/cleanable/dirt, -/obj/machinery/chem_dispenser/botanical, +/obj/machinery/chem_dispenser, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "greenblue" @@ -81332,6 +81337,7 @@ /obj/item/plant_analyzer, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/light_switch/north, +/obj/item/storage/bag/plants/seed_sorting_tray, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "green" diff --git a/modular_ss220/hydroponics/code/dispenser.dm b/modular_ss220/hydroponics/code/dispenser.dm deleted file mode 100644 index a967991a4508..000000000000 --- a/modular_ss220/hydroponics/code/dispenser.dm +++ /dev/null @@ -1,45 +0,0 @@ -/obj/machinery/chem_dispenser/botanical - name = "ботанический химический раздатчик" - desc = "Химический раздатчик, разработанный специально для ботаников." - ui_title = "Ботанический Хим. Раздатчик" - dispensable_reagents = list("mutagen", "saltpetre", "ammonia", "water") - upgrade_reagents = list("atrazine", "glyphosate", "pestkiller", "diethylamine", "ash") - -/obj/machinery/chem_dispenser/botanical/Initialize(mapload) - . = ..() - component_parts = list() - component_parts += new /obj/item/circuitboard/chem_dispenser/botanical(null) - component_parts += new /obj/item/stock_parts/matter_bin(null) - component_parts += new /obj/item/stock_parts/matter_bin(null) - component_parts += new /obj/item/stock_parts/capacitor(null) - component_parts += new /obj/item/stock_parts/manipulator(null) - component_parts += new /obj/item/stack/sheet/glass(null) - component_parts += new cell_type(null) - RefreshParts() - dispensable_reagents = sortList(dispensable_reagents) - -/obj/machinery/chem_dispenser/botanical/upgraded/Initialize(mapload) - . = ..() - component_parts = list() - component_parts += new /obj/item/circuitboard/chem_dispenser/botanical(null) - component_parts += new /obj/item/stock_parts/matter_bin/super(null) - component_parts += new /obj/item/stock_parts/matter_bin/super(null) - component_parts += new /obj/item/stock_parts/capacitor/super(null) - component_parts += new /obj/item/stock_parts/manipulator/pico(null) - component_parts += new /obj/item/stack/sheet/glass(null) - component_parts += new /obj/item/stack/cable_coil(null) - RefreshParts() - -/obj/item/circuitboard/chem_dispenser/botanical - name = "печатная плата (Ботанический Хим. Раздатчик)" - build_path = /obj/machinery/chem_dispenser/botanical - -/datum/design/botanical_dispenser - name = "Machine Board (Ботанический Раздатчик)" - desc = "Плата для ботанического хим. раздатчика." - id = "botanical_dispenser" - req_tech = list("programming" = 5, "biotech" = 3, "materials" = 4, "plasmatech" = 4) - build_type = IMPRINTER - materials = list(MAT_GLASS = 1000) - build_path = /obj/item/circuitboard/chem_dispenser/botanical - category = list("Misc. Machinery") diff --git a/modular_ss220/hydroponics/hydroponics.dme b/modular_ss220/hydroponics/hydroponics.dme index 945c91e274fe..b540371dc72a 100644 --- a/modular_ss220/hydroponics/hydroponics.dme +++ b/modular_ss220/hydroponics/hydroponics.dme @@ -1,5 +1,4 @@ #include "hydroponics.dm" -#include "code/dispenser.dm" #include "code/biogenerator_designs.dm" #include "code/plants.dm"