From e529ce7a23dc5672d11d99e00e33cfe9d15aba88 Mon Sep 17 00:00:00 2001 From: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Date: Fri, 19 Sep 2025 15:50:27 +0100 Subject: [PATCH] Standardizes the permabrig seed inventory. (#30400) * Update departmental_vendors.dm * seeeeeeed * moreseed * Update departmental_vendors.dm * Update deltastation.dmm * e --- _maps/map_files/stations/boxstation.dmm | 85 +++----- _maps/map_files/stations/cerestation.dmm | 198 +++++++----------- _maps/map_files/stations/deltastation.dmm | 66 ++---- _maps/map_files/stations/emeraldstation.dmm | 102 +++------ _maps/map_files/stations/metastation.dmm | 164 ++++++--------- .../machinery/vendors/departmental_vendors.dm | 39 ++++ 6 files changed, 251 insertions(+), 403 deletions(-) diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index ad3f0153b92..e3de69b4279 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -7652,7 +7652,6 @@ /obj/structure/sign/electricshock{ pixel_x = 32 }, -/obj/item/seeds/chili, /obj/machinery/light{ dir = 4 }, @@ -9011,7 +9010,6 @@ /turf/simulated/floor/carpet/grimey, /area/station/maintenance/fpmaint2) "aGa" = ( -/obj/machinery/smartfridge/drying_rack, /obj/machinery/atmospherics/unary/outlet_injector/on{ dir = 1 }, @@ -9020,6 +9018,7 @@ dir = 10; network = list("Prison","SS13") }, +/obj/machinery/economy/vending/hydroseeds/perma, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "aGb" = ( @@ -49265,13 +49264,6 @@ /obj/structure/closet, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) -"euR" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 9 - }, -/obj/structure/lattice/catwalk, -/turf/space, -/area/space/nearstation) "euX" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research/glass, @@ -50921,18 +50913,6 @@ /obj/structure/closet/secure_closet/research_reagents, /turf/simulated/floor/engine, /area/station/science/misc_lab) -"fjM" = ( -/obj/machinery/hydroponics/constructable{ - desc = "These are connected with an irrigation tube. You see a little pipe connecting the trays."; - name = "Prison hydroponics tray"; - using_irrigation = 1 - }, -/obj/item/seeds/onion, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel, -/area/station/security/permabrig) "fjO" = ( /obj/structure/sign/directions/medical{ dir = 4; @@ -51354,7 +51334,6 @@ /obj/structure/sign/electricshock{ pixel_y = -32 }, -/obj/item/seeds/amanita, /turf/simulated/floor/grass, /area/station/security/permabrig) "ftA" = ( @@ -58670,15 +58649,6 @@ /obj/structure/bed/psych, /turf/simulated/floor/carpet, /area/station/medical/psych) -"iZI" = ( -/obj/machinery/hydroponics/constructable{ - desc = "These are connected with an irrigation tube. You see a little pipe connecting the trays."; - name = "Prison hydroponics tray"; - using_irrigation = 1 - }, -/obj/item/seeds/corn, -/turf/simulated/floor/grass, -/area/station/security/permabrig) "iZO" = ( /obj/structure/cable{ icon_state = "0-2" @@ -63705,6 +63675,13 @@ }, /turf/simulated/floor/engine/airless, /area/station/science/toxins/test) +"ltD" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 9 + }, +/obj/structure/lattice/catwalk, +/turf/space, +/area/space/nearstation) "ltR" = ( /obj/structure/plasticflaps{ opacity = 1 @@ -64868,7 +64845,6 @@ /obj/structure/table, /obj/item/storage/fancy/rollingpapers, /obj/item/storage/fancy/matches, -/obj/item/seeds/tobacco, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -65233,15 +65209,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/asmaint) -"mfS" = ( -/obj/machinery/hydroponics/constructable{ - desc = "These are connected with an irrigation tube. You see a little pipe connecting the trays."; - name = "Prison hydroponics tray"; - using_irrigation = 1 - }, -/obj/item/seeds/orange, -/turf/simulated/floor/grass, -/area/station/security/permabrig) "mgx" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical, @@ -65728,7 +65695,6 @@ name = "Prison hydroponics tray"; using_irrigation = 1 }, -/obj/item/seeds/banana, /turf/simulated/floor/grass, /area/station/security/permabrig) "msF" = ( @@ -66989,6 +66955,13 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) +"mZw" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/smartfridge/drying_rack, +/turf/simulated/floor/plasteel, +/area/station/security/permabrig) "mZI" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -82205,6 +82178,13 @@ icon_state = "dark" }, /area/station/engineering/control) +"uud" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 10 + }, +/obj/structure/lattice/catwalk, +/turf/space, +/area/space/nearstation) "uuh" = ( /obj/machinery/disposal, /obj/machinery/light, @@ -82304,13 +82284,6 @@ icon_state = "whiteblue" }, /area/station/medical/surgery/secondary) -"uxh" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 10 - }, -/obj/structure/lattice/catwalk, -/turf/space, -/area/space/nearstation) "uxB" = ( /obj/effect/decal/cleanable/dirt, /obj/item/stack/cable_coil, @@ -85629,7 +85602,6 @@ name = "Prison hydroponics tray"; using_irrigation = 1 }, -/obj/item/seeds/wheat/rice, /obj/machinery/light{ dir = 8 }, @@ -88681,7 +88653,6 @@ name = "Prison hydroponics tray"; using_irrigation = 1 }, -/obj/item/seeds/carrot, /obj/structure/cable{ icon_state = "4-8" }, @@ -109134,8 +109105,8 @@ lKq rAe rAe lKq -mfS -fjM +msC +xKv ftm abN abN @@ -111189,10 +111160,10 @@ lKq lKq lKq twu -avf +mZw aAr aBK -iZI +msC xKv msC abN @@ -125931,7 +125902,7 @@ aab cQp aab cZh -uxh +uud dba djE dcS @@ -125943,7 +125914,7 @@ djE djE djE djE -euR +ltD aab aab aab diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index 1fbf4a53d64..60b26a4ac64 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -5399,6 +5399,16 @@ icon_state = "darkblue" }, /area/station/command/meeting_room) +"aSm" = ( +/obj/structure/table/wood, +/obj/item/stack/cable_coil/random{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/item/stack/cable_coil/random, +/obj/item/eftpos, +/turf/simulated/floor/wood, +/area/station/service/bar) "aSo" = ( /obj/structure/table/reinforced, /obj/item/clothing/ears/earmuffs, @@ -25131,18 +25141,6 @@ icon_state = "asteroidplating" }, /area/station/security/permabrig) -"dLf" = ( -/obj/machinery/hydroponics/constructable{ - desc = "These are connected with an irrigation tube. You see a little pipe connecting the trays."; - name = "Prison hydroponics tray"; - using_irrigation = 1 - }, -/obj/item/seeds/carrot, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/grass, -/area/station/security/permabrig) "dLh" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -26033,6 +26031,26 @@ icon_state = "darkyellowcorners" }, /area/station/engineering/atmos) +"dUe" = ( +/obj/structure/closet/crate/hydroponics, +/obj/item/reagent_containers/glass/bottle/nutrient/ez, +/obj/item/reagent_containers/glass/bottle/nutrient/ez, +/obj/item/reagent_containers/glass/bottle/nutrient/ez, +/obj/item/reagent_containers/spray/pestspray, +/obj/item/reagent_containers/spray/pestspray, +/obj/item/clothing/gloves/botanic_leather, +/obj/item/cultivator, +/obj/item/cultivator, +/obj/item/shovel/spade, +/obj/item/shovel/spade, +/obj/item/plant_analyzer, +/obj/item/storage/bag/plants/seed_sorting_tray, +/obj/item/wrench, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "green" + }, +/area/station/security/permabrig) "dUj" = ( /obj/effect/spawner/random/dirt/frequent, /obj/structure/disposalpipe/segment/corner{ @@ -34406,25 +34424,11 @@ /turf/simulated/mineral/ancient/outer, /area/mine/unexplored/cere/medical) "fMn" = ( -/obj/structure/closet/crate/hydroponics, -/obj/item/reagent_containers/glass/bottle/nutrient/ez, -/obj/item/reagent_containers/glass/bottle/nutrient/ez, -/obj/item/reagent_containers/glass/bottle/nutrient/ez, -/obj/item/reagent_containers/spray/pestspray, -/obj/item/reagent_containers/spray/pestspray, -/obj/item/clothing/gloves/botanic_leather, -/obj/item/cultivator, -/obj/item/cultivator, -/obj/item/shovel/spade, -/obj/item/shovel/spade, -/obj/item/plant_analyzer, -/obj/item/storage/bag/plants/seed_sorting_tray, -/obj/item/wrench, -/obj/item/radio/intercom/locked/prison{ - name = "Prison Intercom (General)"; - pixel_x = -25 +/obj/machinery/smartfridge/drying_rack, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "green" }, -/turf/simulated/floor/plasteel, /area/station/security/permabrig) "fMs" = ( /obj/structure/cable/orange{ @@ -37073,6 +37077,17 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/disposal/north) +"gsP" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/hydroponics/constructable{ + desc = "These are connected with an irrigation tube. You see a little pipe connecting the trays."; + name = "Prison hydroponics tray"; + using_irrigation = 1 + }, +/turf/simulated/floor/grass, +/area/station/security/permabrig) "gtn" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -38135,6 +38150,14 @@ icon_state = "asteroidplating" }, /area/station/maintenance/starboard) +"gFl" = ( +/obj/structure/flora/grass/jungle, +/obj/item/radio/intercom/locked/prison{ + name = "Prison Intercom (General)"; + pixel_x = 28 + }, +/turf/simulated/floor/grass, +/area/station/security/permabrig) "gFu" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 4 @@ -50246,9 +50269,6 @@ name = "Prison hydroponics tray"; using_irrigation = 1 }, -/obj/item/seeds/wheat/rice, -/obj/item/seeds/wheat/rice, -/obj/item/seeds/wheat/rice, /obj/machinery/camera{ c_tag = "Prison Garden North"; network = list("Prison","SS13") @@ -56016,8 +56036,6 @@ name = "Prison hydroponics tray"; using_irrigation = 1 }, -/obj/item/seeds/chili, -/obj/item/seeds/chili, /turf/simulated/floor/grass, /area/station/security/permabrig) "knZ" = ( @@ -61334,16 +61352,6 @@ icon_state = "dark" }, /area/station/engineering/break_room/secondary) -"lsh" = ( -/obj/structure/table/wood, -/obj/item/stack/cable_coil/random{ - pixel_x = 2; - pixel_y = 3 - }, -/obj/item/stack/cable_coil/random, -/obj/item/eftpos, -/turf/simulated/floor/wood, -/area/station/service/bar) "lsp" = ( /obj/effect/spawner/window/reinforced/polarized{ id = "scibreak" @@ -65612,7 +65620,6 @@ "mle" = ( /obj/structure/table, /obj/item/storage/fancy/matches, -/obj/item/seeds/tobacco, /obj/item/storage/fancy/rollingpapers, /turf/simulated/floor/plasteel, /area/station/security/permabrig) @@ -74914,16 +74921,6 @@ /obj/effect/spawner/airlock/w_to_e/long, /turf/simulated/wall/r_wall, /area/station/hallway/secondary/entry) -"opy" = ( -/obj/machinery/hydroponics/constructable{ - desc = "These are connected with an irrigation tube. You see a little pipe connecting the trays."; - name = "Prison hydroponics tray"; - using_irrigation = 1 - }, -/obj/item/seeds/olive, -/obj/item/seeds/olive, -/turf/simulated/floor/grass, -/area/station/security/permabrig) "opD" = ( /obj/machinery/kitchen_machine/microwave, /obj/structure/table, @@ -77746,7 +77743,10 @@ "oVM" = ( /obj/structure/sink/kitchen/old/directional/east, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "green" + }, /area/station/security/permabrig) "oWg" = ( /obj/machinery/conveyor{ @@ -81075,16 +81075,6 @@ }, /turf/simulated/floor/carpet/royalblack, /area/station/command/office/captain) -"pGX" = ( -/obj/machinery/hydroponics/constructable{ - desc = "These are connected with an irrigation tube. You see a little pipe connecting the trays."; - name = "Prison hydroponics tray"; - using_irrigation = 1 - }, -/obj/item/seeds/orange, -/obj/item/seeds/orange, -/turf/simulated/floor/grass, -/area/station/security/permabrig) "pHf" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -87429,17 +87419,6 @@ "raX" = ( /turf/simulated/wall/r_wall, /area/station/maintenance/electrical_shop) -"rbb" = ( -/obj/machinery/hydroponics/constructable{ - desc = "These are connected with an irrigation tube. You see a little pipe connecting the trays."; - name = "Prison hydroponics tray"; - using_irrigation = 1 - }, -/obj/item/seeds/carrot, -/obj/item/seeds/carrot, -/obj/item/seeds/carrot, -/turf/simulated/floor/grass, -/area/station/security/permabrig) "rbd" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -91195,16 +91174,6 @@ icon_state = "dark" }, /area/station/engineering/atmos) -"rRF" = ( -/obj/machinery/hydroponics/constructable{ - desc = "These are connected with an irrigation tube. You see a little pipe connecting the trays."; - name = "Prison hydroponics tray"; - using_irrigation = 1 - }, -/obj/item/seeds/corn, -/obj/item/seeds/corn, -/turf/simulated/floor/grass, -/area/station/security/permabrig) "rRJ" = ( /obj/structure/cable/orange{ icon_state = "1-2" @@ -97244,18 +97213,6 @@ icon_state = "asteroidplating" }, /area/space/nearstation/disposals) -"tcX" = ( -/obj/machinery/hydroponics/constructable{ - desc = "These are connected with an irrigation tube. You see a little pipe connecting the trays."; - name = "Prison hydroponics tray"; - using_irrigation = 1 - }, -/obj/item/seeds/coffee, -/obj/item/seeds/coffee, -/obj/item/seeds/tea, -/obj/item/seeds/tea, -/turf/simulated/floor/grass, -/area/station/security/permabrig) "tcY" = ( /obj/structure/chair/sofa/corp/right{ dir = 8 @@ -109002,7 +108959,7 @@ /obj/machinery/atmospherics/unary/outlet_injector/on{ dir = 4 }, -/obj/machinery/smartfridge/drying_rack, +/obj/machinery/economy/vending/hydroseeds/perma, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "green" @@ -114214,17 +114171,6 @@ icon_state = "arrival" }, /area/station/hallway/secondary/entry/south) -"wEm" = ( -/obj/machinery/hydroponics/constructable{ - desc = "These are connected with an irrigation tube. You see a little pipe connecting the trays."; - name = "Prison hydroponics tray"; - using_irrigation = 1 - }, -/obj/item/seeds/corn, -/obj/item/seeds/corn, -/obj/item/seeds/carrot, -/turf/simulated/floor/grass, -/area/station/security/permabrig) "wEo" = ( /mob/living/simple_animal/bot/cleanbot{ on = 0 @@ -138583,7 +138529,7 @@ rNK rNK rNK cRv -cRv +afd afd aTz aTz @@ -138839,12 +138785,12 @@ rNK rNK rNK rNK -cRv afd -aTz -rbb -wEm -pGX +afd +gsP +knU +knU +knU knU tFn vFk @@ -139097,8 +139043,8 @@ lzH lzH lzH afd -epR -dLf +dUe +iiQ daF xdA uoq @@ -140641,12 +140587,12 @@ cRv afd aTz jfC -rRF -opy -tcX -pGX +knU +knU +knU +knU dqM -uoq +gFl drf acR vdq @@ -143058,7 +143004,7 @@ oOg unz wmR wDV -lsh +aSm aZZ wmR ehV diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index ed3f69ed2b8..fae3e814839 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -10922,6 +10922,15 @@ }, /turf/simulated/floor/wood, /area/station/service/theatre) +"aSj" = ( +/obj/machinery/flasher{ + id = "Execution"; + pixel_y = -27 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/station/security/execution) "aSp" = ( /obj/structure/cable{ icon_state = "1-2" @@ -52379,7 +52388,6 @@ name = "Prison hydroponics tray"; using_irrigation = 1 }, -/obj/item/seeds/apple, /turf/simulated/floor/plasteel{ icon_state = "green"; dir = 1 @@ -55686,7 +55694,6 @@ name = "Prison hydroponics tray"; using_irrigation = 1 }, -/obj/item/seeds/chili, /turf/simulated/floor/plasteel{ icon_state = "green"; dir = 4 @@ -58768,7 +58775,6 @@ name = "Prison hydroponics tray"; using_irrigation = 1 }, -/obj/item/seeds/orange, /turf/simulated/floor/plasteel{ icon_state = "green"; dir = 4 @@ -61815,7 +61821,6 @@ name = "Prison hydroponics tray"; using_irrigation = 1 }, -/obj/item/seeds/corn, /turf/simulated/floor/plasteel{ icon_state = "green"; dir = 1 @@ -68787,18 +68792,6 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) -"lLv" = ( -/obj/machinery/hydroponics/constructable{ - desc = "These are connected with an irrigation tube. You see a little pipe connecting the trays."; - name = "Prison hydroponics tray"; - using_irrigation = 1 - }, -/obj/item/seeds/amanita, -/turf/simulated/floor/plasteel{ - icon_state = "green"; - dir = 1 - }, -/area/station/security/permabrig) "lLN" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -75430,6 +75423,7 @@ "oFa" = ( /obj/structure/toilet/directional/east, /obj/machinery/newscaster/directional/north, +/obj/item/seeds/ambrosia, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -75522,15 +75516,6 @@ icon_state = "tranquillite" }, /area/station/service/kitchen) -"oHl" = ( -/obj/machinery/flasher{ - id = "Execution"; - pixel_y = -27 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/station/security/execution) "oHv" = ( /obj/structure/cable{ icon_state = "1-2" @@ -77524,8 +77509,6 @@ name = "Prison hydroponics tray"; using_irrigation = 1 }, -/obj/item/seeds/carrot, -/obj/structure/sign/poster/random/directional/north, /obj/machinery/light{ dir = 1 }, @@ -88526,7 +88509,6 @@ name = "Prison hydroponics tray"; using_irrigation = 1 }, -/obj/item/seeds/ambrosia, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "green" @@ -89627,18 +89609,6 @@ }, /turf/simulated/floor/plasteel/white, /area/station/medical/medbay) -"utT" = ( -/obj/machinery/hydroponics/constructable{ - desc = "These are connected with an irrigation tube. You see a little pipe connecting the trays."; - name = "Prison hydroponics tray"; - using_irrigation = 1 - }, -/obj/item/seeds/tobacco, -/turf/simulated/floor/plasteel{ - icon_state = "green"; - dir = 4 - }, -/area/station/security/permabrig) "uuh" = ( /obj/structure/table, /obj/item/paper_bin, @@ -91660,6 +91630,12 @@ /obj/structure/girder, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) +"vmO" = ( +/obj/machinery/economy/vending/hydroseeds/perma, +/turf/simulated/floor/plasteel{ + icon_state = "green" + }, +/area/station/security/permabrig) "vmP" = ( /obj/structure/extinguisher_cabinet{ name = "south bump"; @@ -93291,7 +93267,7 @@ name = "Prison hydroponics tray"; using_irrigation = 1 }, -/obj/item/seeds/wheat/rice, +/obj/structure/sign/poster/random/directional/north, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "green" @@ -155990,7 +155966,7 @@ mcN eWc vWW mgM -hHz +vmO lqC jgK pfD @@ -156264,7 +156240,7 @@ eud jbp uNJ vzV -oHl +aSj aMv aaa aaa @@ -156498,7 +156474,7 @@ aWP aaa aaa trJ -lLv +iGe aVw eWc oeS @@ -157014,7 +156990,7 @@ abj ygH ygH gRn -utT +fPa hmz fPa tKH diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm index 097aeaf9705..f413f808d90 100644 --- a/_maps/map_files/stations/emeraldstation.dmm +++ b/_maps/map_files/stations/emeraldstation.dmm @@ -21013,6 +21013,7 @@ pixel_x = -8; pixel_y = 19 }, +/obj/structure/flora/grass/jungle, /turf/simulated/floor/grass, /area/station/security/permabrig) "ekE" = ( @@ -22173,7 +22174,6 @@ name = "Prison hydroponics tray"; using_irrigation = 1 }, -/obj/item/seeds/glowshroom, /obj/machinery/light{ dir = 4 }, @@ -24367,7 +24367,6 @@ name = "Prison hydroponics tray"; using_irrigation = 1 }, -/obj/item/seeds/glowshroom, /obj/machinery/light{ dir = 8 }, @@ -26619,7 +26618,6 @@ name = "Prison hydroponics tray"; using_irrigation = 1 }, -/obj/item/seeds/orange, /obj/structure/cable{ icon_state = "4-8" }, @@ -52957,15 +52955,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_port) -"kyf" = ( -/obj/machinery/hydroponics/constructable{ - desc = "These are connected with an irrigation tube. You see a little pipe connecting the trays."; - name = "Prison hydroponics tray"; - using_irrigation = 1 - }, -/obj/item/seeds/ambrosia, -/turf/simulated/floor/grass, -/area/station/security/permabrig) "kyl" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -56873,6 +56862,10 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel, /area/station/engineering/gravitygenerator) +"loZ" = ( +/obj/machinery/economy/vending/hydroseeds/perma, +/turf/simulated/floor/grass, +/area/station/security/permabrig) "lph" = ( /obj/effect/decal/cleanable/generic, /obj/effect/decal/cleanable/dirt, @@ -68817,7 +68810,6 @@ name = "Prison hydroponics tray"; using_irrigation = 1 }, -/obj/item/seeds/apple, /turf/simulated/floor/grass, /area/station/security/permabrig) "nJz" = ( @@ -82585,11 +82577,11 @@ }, /area/station/public/shops) "qtA" = ( +/obj/structure/flora/junglebush, /obj/item/reagent_containers/glass/bucket{ pixel_x = 9; pixel_y = 19 }, -/obj/structure/flora/junglebush, /turf/simulated/floor/grass, /area/station/security/permabrig) "qtF" = ( @@ -90708,18 +90700,6 @@ icon_state = "redyellowfull" }, /area/station/public/shops) -"rWG" = ( -/obj/machinery/hydroponics/constructable{ - desc = "These are connected with an irrigation tube. You see a little pipe connecting the trays."; - name = "Prison hydroponics tray"; - using_irrigation = 1 - }, -/obj/item/seeds/onion, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/grass, -/area/station/security/permabrig) "rWI" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp{ @@ -100378,7 +100358,6 @@ name = "Prison hydroponics tray"; using_irrigation = 1 }, -/obj/item/seeds/carrot, /obj/item/radio/intercom/locked/prison{ name = "Prison Intercom (General)"; pixel_y = -25 @@ -102406,15 +102385,6 @@ icon_state = "bluecorner" }, /area/station/hallway/primary/starboard) -"umW" = ( -/obj/machinery/hydroponics/constructable{ - desc = "These are connected with an irrigation tube. You see a little pipe connecting the trays."; - name = "Prison hydroponics tray"; - using_irrigation = 1 - }, -/obj/item/seeds/chili, -/turf/simulated/floor/grass, -/area/station/security/permabrig) "und" = ( /turf/simulated/wall/r_wall, /area/station/telecomms/computer) @@ -107868,17 +107838,13 @@ /obj/item/shovel/spade, /obj/item/plant_analyzer, /obj/item/storage/bag/plants/seed_sorting_tray, -/obj/item/seeds/carrot, -/obj/item/seeds/banana, -/obj/item/seeds/wheat/rice, -/obj/item/seeds/wheat, -/obj/item/seeds/tobacco, /obj/item/reagent_containers/spray/pestspray, /obj/machinery/camera{ c_tag = "Perma A Botany"; network = list("Prison","SS13"); dir = 1 }, +/obj/item/seeds/ambrosia, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "vrP" = ( @@ -116671,17 +116637,13 @@ /obj/item/shovel/spade, /obj/item/plant_analyzer, /obj/item/storage/bag/plants/seed_sorting_tray, -/obj/item/seeds/carrot, -/obj/item/seeds/banana, -/obj/item/seeds/wheat/rice, -/obj/item/seeds/wheat, -/obj/item/seeds/tobacco, /obj/item/reagent_containers/spray/pestspray, /obj/machinery/camera{ c_tag = "Perma B Botany"; network = list("Prison","SS13"); dir = 10 }, +/obj/item/seeds/ambrosia, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "xic" = ( @@ -121509,18 +121471,6 @@ }, /turf/simulated/floor/plasteel, /area/station/maintenance/fsmaint2) -"yfK" = ( -/obj/machinery/hydroponics/constructable{ - desc = "These are connected with an irrigation tube. You see a little pipe connecting the trays."; - name = "Prison hydroponics tray"; - using_irrigation = 1 - }, -/obj/item/seeds/onion, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/grass, -/area/station/security/permabrig) "yfS" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -169739,10 +169689,10 @@ jnP jnP jnP jnP -jnP -jnP +aZS iWn fjJ +fjJ teD mTb qvC @@ -169996,13 +169946,13 @@ jnP jnP jnP jnP -jnP aZS fjJ fjJ -umW +acO +nJu fnn -kyf +nJu eTc eTx eTx @@ -170254,9 +170204,9 @@ jnP jnP xzz aZS -aZS fjJ -rWG +eTc +nnB ekC uHT hkd @@ -170512,8 +170462,8 @@ jnP jnP jnP fjJ -fjJ -acO +loZ +mKT nnB qgl ops @@ -175138,8 +175088,8 @@ jnP jnP jnP fjJ -fjJ -acO +loZ +mKT mKT aSV caJ @@ -175394,9 +175344,9 @@ jnP jnP xzz aZS -aZS fjJ -yfK +evQ +hkd qtA hIi nnB @@ -175650,13 +175600,13 @@ jnP jnP jnP jnP -jnP aZS fjJ fjJ -umW +acO +nJu fnn -kyf +nJu evQ eTx eTx @@ -175907,10 +175857,10 @@ jnP jnP jnP jnP -jnP -jnP +aZS kvZ fjJ +fjJ lsR uGH qSw diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index 799da2fbef6..a8e6ae51372 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -147,23 +147,6 @@ icon_state = "neutralcorner" }, /area/station/hallway/primary/central/north) -"acI" = ( -/obj/item/seeds/wheat/rice, -/obj/item/seeds/wheat/rice, -/obj/item/seeds/wheat/rice, -/obj/machinery/camera{ - c_tag = "Prison Forestry"; - dir = 4; - network = list("Prison","SS13") - }, -/obj/machinery/hydroponics/constructable{ - desc = "These are connected with an irrigation tube. You see a little pipe connecting the trays."; - name = "Prison hydroponics tray"; - using_irrigation = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/grass/no_creep, -/area/station/security/permabrig) "acL" = ( /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plating, @@ -19473,6 +19456,19 @@ icon_state = "white" }, /area/station/science/lobby) +"bUS" = ( +/obj/machinery/camera{ + c_tag = "Prison Forestry"; + dir = 4; + network = list("Prison","SS13") + }, +/obj/machinery/hydroponics/constructable{ + desc = "These are connected with an irrigation tube. You see a little pipe connecting the trays."; + name = "Prison hydroponics tray"; + using_irrigation = 1 + }, +/turf/simulated/floor/grass/no_creep, +/area/station/security/permabrig) "bUV" = ( /obj/item/radio/intercom{ name = "east bump"; @@ -37606,7 +37602,6 @@ /obj/structure/table, /obj/item/storage/fancy/rollingpapers, /obj/item/storage/fancy/matches, -/obj/item/seeds/tobacco, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "eVE" = ( @@ -38033,6 +38028,17 @@ icon_state = "blue" }, /area/station/hallway/secondary/exit) +"fcp" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/hydroponics/constructable{ + desc = "These are connected with an irrigation tube. You see a little pipe connecting the trays."; + name = "Prison hydroponics tray"; + using_irrigation = 1 + }, +/turf/simulated/floor/grass/no_creep, +/area/station/security/permabrig) "fcx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 5 @@ -41038,6 +41044,13 @@ }, /turf/simulated/floor/engine, /area/station/engineering/engine/supermatter) +"gfK" = ( +/obj/machinery/economy/vending/hydroseeds/perma, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "green" + }, +/area/station/security/permabrig) "gfY" = ( /obj/structure/disposalpipe/segment/corner{ dir = 2 @@ -49461,6 +49474,17 @@ icon_state = "dark" }, /area/station/engineering/control) +"jnG" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/hydroponics/constructable{ + desc = "These are connected with an irrigation tube. You see a little pipe connecting the trays."; + name = "Prison hydroponics tray"; + using_irrigation = 1 + }, +/turf/simulated/floor/grass/no_creep, +/area/station/security/permabrig) "jnZ" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/camera{ @@ -54320,7 +54344,7 @@ "kUy" = ( /obj/machinery/biogenerator, /turf/simulated/floor/plasteel{ - dir = 9; + dir = 1; icon_state = "green" }, /area/station/security/permabrig) @@ -55474,16 +55498,6 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) -"lmP" = ( -/obj/item/seeds/amanita, -/obj/machinery/hydroponics/constructable{ - desc = "These are connected with an irrigation tube. You see a little pipe connecting the trays."; - name = "Prison hydroponics tray"; - using_irrigation = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/grass/no_creep, -/area/station/security/permabrig) "lna" = ( /obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ @@ -66110,14 +66124,11 @@ }, /area/station/engineering/control) "pdc" = ( -/obj/item/seeds/carrot, -/obj/item/seeds/carrot, /obj/machinery/hydroponics/constructable{ desc = "These are connected with an irrigation tube. You see a little pipe connecting the trays."; name = "Prison hydroponics tray"; using_irrigation = 1 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/grass/no_creep, /area/station/security/permabrig) "pde" = ( @@ -71469,21 +71480,6 @@ /obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/bluespace, /area/station/maintenance/starboard) -"qZg" = ( -/obj/item/seeds/chili, -/obj/item/seeds/chili, -/obj/item/seeds/chili, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/hydroponics/constructable{ - desc = "These are connected with an irrigation tube. You see a little pipe connecting the trays."; - name = "Prison hydroponics tray"; - using_irrigation = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/grass/no_creep, -/area/station/security/permabrig) "qZl" = ( /obj/machinery/light/small{ dir = 1 @@ -84728,20 +84724,6 @@ icon_state = "dark" }, /area/station/engineering/control) -"wab" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/item/seeds/corn, -/obj/item/seeds/corn, -/obj/machinery/hydroponics/constructable{ - desc = "These are connected with an irrigation tube. You see a little pipe connecting the trays."; - name = "Prison hydroponics tray"; - using_irrigation = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/grass/no_creep, -/area/station/security/permabrig) "waj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -87003,9 +86985,6 @@ /turf/simulated/floor/plasteel, /area/station/security/brig) "wRL" = ( -/obj/item/seeds/apple, -/obj/item/seeds/apple, -/obj/item/seeds/apple, /obj/structure/cable{ icon_state = "1-2" }, @@ -87014,7 +86993,6 @@ name = "Prison hydroponics tray"; using_irrigation = 1 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/grass/no_creep, /area/station/security/permabrig) "wSh" = ( @@ -88809,18 +88787,6 @@ /obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/public/vacant_office) -"xvX" = ( -/obj/item/seeds/orange, -/obj/item/seeds/orange, -/obj/item/seeds/orange, -/obj/machinery/hydroponics/constructable{ - desc = "These are connected with an irrigation tube. You see a little pipe connecting the trays."; - name = "Prison hydroponics tray"; - using_irrigation = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/grass/no_creep, -/area/station/security/permabrig) "xwg" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -109007,12 +108973,12 @@ arB aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa +hqL +urv +bsA +abW +abW +abW aaa abq aaa @@ -109263,12 +109229,12 @@ aaa abf aaa aaa -aaa hqL -urv -bsA -abW -abW +dgp +pdc +jnG +fcp +bUS abW abq ajo @@ -109520,12 +109486,12 @@ aaa abf aaa aaa -hqL -dgp -xvX -qZg -wab -acI +nKf +gfK +evX +sbK +eAt +gCp abW aaa abq @@ -109779,10 +109745,10 @@ aaa aaa nKf kUy -evX -sbK -eAt -gCp +adi +adi +adi +aJM abW aaa abq @@ -110811,7 +110777,7 @@ pcd udK uEB awA -lmP +pdc gjF abq aaa diff --git a/code/game/machinery/vendors/departmental_vendors.dm b/code/game/machinery/vendors/departmental_vendors.dm index 2ac713c84da..a8793506384 100644 --- a/code/game/machinery/vendors/departmental_vendors.dm +++ b/code/game/machinery/vendors/departmental_vendors.dm @@ -238,6 +238,45 @@ refill_canister = /obj/item/vending_refill/hydroseeds +/obj/machinery/economy/vending/hydroseeds/perma + name = "\improper PrisonSeed Servitor" + desc = "Dispenses seeds for prisoners to grow plants with. It's supposed to help reform them into good citizens, or something." + slogan_list = list("You've got nothing better to do. Might as well take up gardening!", + "Hands down the best restricted seed selection in prison!", + "No crimes against God or your money back!") + products = list(/obj/item/seeds/apple = 3, + /obj/item/seeds/cabbage = 3, + /obj/item/seeds/carrot = 3, + /obj/item/seeds/chili = 3, + /obj/item/seeds/cocoapod = 3, + /obj/item/seeds/corn = 3, + /obj/item/seeds/eggplant = 3, + /obj/item/seeds/garlic = 3, + /obj/item/seeds/grape = 3, + /obj/item/seeds/grass = 3, + /obj/item/seeds/lettuce = 3, + /obj/item/seeds/lime = 3, + /obj/item/seeds/olive = 3, + /obj/item/seeds/onion = 3, + /obj/item/seeds/orange = 3, + /obj/item/seeds/pineapple = 3, + /obj/item/seeds/plum = 3, + /obj/item/seeds/plump = 3, + /obj/item/seeds/potato = 3, + /obj/item/seeds/pumpkin = 3, + /obj/item/seeds/wheat/rice = 3, + /obj/item/seeds/soya = 3, + /obj/item/seeds/sugarcane = 3, + /obj/item/seeds/tobacco = 3, + /obj/item/seeds/watermelon = 3, + /obj/item/seeds/wheat = 3,) + + contraband = list(/obj/item/seeds/cannabis = 3, + /obj/item/seeds/fungus = 3, + /obj/item/seeds/liberty = 3, + /obj/item/seeds/reishi = 3, + /obj/item/seeds/starthistle = 3,) + /obj/machinery/economy/vending/medical name = "\improper NanoMed Plus" desc = "Medical drug dispenser."