diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm index f75e75daa3b..49b26a0e751 100644 --- a/_maps/map_files/Birdshot/birdshot.dmm +++ b/_maps/map_files/Birdshot/birdshot.dmm @@ -9396,6 +9396,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, +/obj/item/kirbyplants/random, /turf/open/floor/iron/white, /area/station/science/cytology) "dGi" = ( @@ -45619,9 +45620,9 @@ /turf/open/floor/iron/cafeteria, /area/station/science/circuits) "pKM" = ( -/obj/item/kirbyplants/random, /obj/item/radio/intercom/directional/north, /obj/machinery/firealarm/directional/west, +/obj/machinery/vending/cytopro, /turf/open/floor/iron/white, /area/station/science/cytology) "pKR" = ( diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 5527ef0b165..3af6ec23a73 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -24724,6 +24724,7 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 }, +/obj/machinery/vending/cytopro, /turf/open/floor/iron, /area/station/science/xenobiology) "gfR" = ( diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 5464fbe3523..dfe67247393 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -73375,6 +73375,7 @@ /obj/structure/railing/corner{ dir = 8 }, +/obj/structure/closet/secure_closet/cytology, /turf/open/floor/iron/smooth_large, /area/station/science/cytology) "vvu" = ( @@ -82556,7 +82557,7 @@ /area/station/medical/chemistry) "ycx" = ( /obj/structure/railing, -/obj/structure/closet/secure_closet/cytology, +/obj/machinery/vending/cytopro, /turf/open/floor/iron/smooth_large, /area/station/science/cytology) "ycA" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 708f027397a..2b5ed0984dd 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -26823,13 +26823,13 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "juH" = ( -/obj/item/kirbyplants/random, /obj/machinery/firealarm/directional/west{ pixel_y = -9 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/machinery/vending/cytopro, /turf/open/floor/iron/white, /area/station/science/cytology) "juJ" = ( @@ -55093,6 +55093,7 @@ /obj/machinery/atmospherics/components/binary/pump{ dir = 4 }, +/obj/item/kirbyplants/random, /turf/open/floor/iron/white, /area/station/science/cytology) "tmq" = ( diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm index 11f64dc3ce3..6cfe8415747 100644 --- a/_maps/map_files/NorthStar/north_star.dmm +++ b/_maps/map_files/NorthStar/north_star.dmm @@ -52347,6 +52347,7 @@ }, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/west, +/obj/machinery/vending/cytopro, /turf/open/floor/iron, /area/station/science/cytology) "nxm" = ( @@ -68772,10 +68773,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/third) -"rLs" = ( -/obj/item/kirbyplants/random, -/turf/open/floor/iron/dark, -/area/station/hallway/floor1/fore) "rLx" = ( /obj/machinery/light/directional/north, /turf/open/floor/iron, @@ -83126,10 +83123,6 @@ dir = 1 }, /area/station/science/genetics) -"vvn" = ( -/obj/item/kirbyplants/random, -/turf/open/floor/iron/dark, -/area/station/hallway/floor1/fore) "vvs" = ( /obj/machinery/duct, /obj/effect/turf_decal/stripes/line{ @@ -111636,7 +111629,7 @@ sZI nVw vZC tKe -vvn +muj sPJ xtY oWA @@ -113166,7 +113159,7 @@ tNS wRT jxa oic -rLs +muj aUJ vWF pxu @@ -113182,7 +113175,7 @@ tTy hyD vWF crO -rLs +muj hJy aLP hJy @@ -115479,7 +115472,7 @@ fHM dIz nJY oic -rLs +muj gVw rpj vLP @@ -117027,7 +117020,7 @@ oOc bCz prw rze -rLs +muj rpj gqU vsv diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 586f22a81d3..df6b47695f9 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -48487,6 +48487,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 }, +/obj/machinery/vending/cytopro, /turf/open/floor/iron/white, /area/station/science/xenobiology) "pWC" = ( diff --git a/_maps/map_files/wawastation/wawastation.dmm b/_maps/map_files/wawastation/wawastation.dmm index b9246bee6a8..ae5f53d7812 100644 --- a/_maps/map_files/wawastation/wawastation.dmm +++ b/_maps/map_files/wawastation/wawastation.dmm @@ -60729,6 +60729,7 @@ /turf/open/floor/iron, /area/station/engineering/lobby) "vqN" = ( +/obj/machinery/vending/cytopro, /turf/open/floor/iron/dark/small, /area/station/science/cytology) "vqY" = ( diff --git a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm index 5e41b35d9bb..b72b7c015e1 100644 --- a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm @@ -631,6 +631,7 @@ /obj/machinery/vending/coffee = "Solar's Best Hot Drinks", /obj/machinery/vending/cola = "Robust Softdrinks", /obj/machinery/vending/custom = "Custom Vendor", + /obj/machinery/vending/cytopro = "CytoPro", /obj/machinery/vending/dinnerware = "Plasteel Chef's Dinnerware Vendor", /obj/machinery/vending/drugs = "NanoDrug Plus", /obj/machinery/vending/engineering = "Robco Tool Maker", diff --git a/code/game/objects/items/storage/boxes/science_boxes.dm b/code/game/objects/items/storage/boxes/science_boxes.dm index 48ab6cd5b72..63e1c1ee376 100644 --- a/code/game/objects/items/storage/boxes/science_boxes.dm +++ b/code/game/objects/items/storage/boxes/science_boxes.dm @@ -39,6 +39,7 @@ illustration = null /// Which type of cube are we spawning in this box? var/cube_type = /obj/item/food/monkeycube + custom_price = PAYCHECK_CREW * 2 /obj/item/storage/box/monkeycubes/Initialize(mapload) . = ..() diff --git a/code/modules/cargo/packs/vending_restock.dm b/code/modules/cargo/packs/vending_restock.dm index 10ae874d5d6..6437e6027b8 100644 --- a/code/modules/cargo/packs/vending_restock.dm +++ b/code/modules/cargo/packs/vending_restock.dm @@ -19,6 +19,13 @@ crate_name = "cigarette supply crate" crate_type = /obj/structure/closet/crate +/datum/supply_pack/vending/science/cytopro + name = "Cytology Vendor Supply Crate" + desc = "For all your vat-growing needs! Contains a CytoPro machine refill." + cost = CARGO_CRATE_VALUE * 3 + contains = list(/obj/item/vending_refill/cytopro) + crate_name = "cytopro supply crate" + /datum/supply_pack/vending/dinnerware name = "Dinnerware Supply Crate" desc = "More knives for the chef." diff --git a/code/modules/research/xenobiology/vatgrowing/petri_dish.dm b/code/modules/research/xenobiology/vatgrowing/petri_dish.dm index 0187fa8eda3..cbae2d50e20 100644 --- a/code/modules/research/xenobiology/vatgrowing/petri_dish.dm +++ b/code/modules/research/xenobiology/vatgrowing/petri_dish.dm @@ -59,6 +59,7 @@ list(CELL_LINE_TABLE_COCKROACH, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 7), list(CELL_LINE_TABLE_BLOBBERNAUT, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5) ) + name = "mystery petri dish" /obj/item/petri_dish/random/Initialize(mapload) . = ..() diff --git a/code/modules/vending/cytopro.dm b/code/modules/vending/cytopro.dm new file mode 100644 index 00000000000..ca4242b4c7d --- /dev/null +++ b/code/modules/vending/cytopro.dm @@ -0,0 +1,35 @@ +/obj/machinery/vending/cytopro + name = "\improper CytoPro" + desc = "For all your cytology needs!" + product_slogans = "Cloning? Don't be ridiculous.;Don't be uncultured, get some cells growing!;Who needs farms when we got vats?" + product_ads = "Grow your own little creatures!;Biology, at your fingertips!" + icon_state = "cytopro" + icon_deny = "cytopro-deny" + panel_type = "panel2" + light_mask = "cytopro-light-mask" + products = list( + /obj/item/storage/bag/xeno = 5, + /obj/item/reagent_containers/condiment/protein = 10, + /obj/item/storage/box/swab = 3, + /obj/item/storage/box/petridish = 3, + /obj/item/storage/box/monkeycubes = 3, + /obj/item/biopsy_tool = 3, + /obj/item/clothing/under/rank/rnd/scientist = 5, + /obj/item/clothing/suit/toggle/labcoat = 5, + /obj/item/clothing/suit/bio_suit = 3, + /obj/item/clothing/head/bio_hood = 3, + /obj/item/reagent_containers/dropper = 5, + /obj/item/reagent_containers/syringe = 5 + ) + contraband = list( + /obj/item/knife/kitchen = 3, + /obj/item/petri_dish/random = 6 + ) + refill_canister = /obj/item/vending_refill/cytopro + default_price = PAYCHECK_CREW * 0.6 + extra_price = PAYCHECK_COMMAND * 0.5 + payment_department = ACCOUNT_SCI + +/obj/item/vending_refill/cytopro + machine_name = "CytoPro" + icon_state = "refill_plant" diff --git a/icons/obj/machines/vending.dmi b/icons/obj/machines/vending.dmi index 54c4b0b421a..76edb1f7125 100644 Binary files a/icons/obj/machines/vending.dmi and b/icons/obj/machines/vending.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 8d65b76d6d3..d5b16fb94d0 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6206,6 +6206,7 @@ #include "code\modules\vending\clothesmate.dm" #include "code\modules\vending\coffee.dm" #include "code\modules\vending\cola.dm" +#include "code\modules\vending\cytopro.dm" #include "code\modules\vending\donk.dm" #include "code\modules\vending\drinnerware.dm" #include "code\modules\vending\engineering.dm"