mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-31 09:08:30 +01:00
Adds a new cytology-focused vending machine to the science area (#85338)
## About The Pull Request Creates a new vending machine in the science area, called the CytoPro and filled with cytology gear (and a few things that might be useful in xenobiology). This vending machine is added to the cytology labs of all maps. Here's how it looks in-game (with the panel screwed open, I was hacking it to test at the time)  The current product list is shown below.   I've put them in the locations shown below. Birdshot:  Delta:  Icebox:  Northstar:  Tram:  Wawa:  **Feedback on more products welcome!** ## Why It's Good For The Game Currently, there aren't a lot of backup sources for cytology gear. Most maps spawn with a single cytology closet containing the necessary gear, and good luck to you if someone makes off with the supplies before you get there. In addition to adding a source of backup cytology equipment, I'm hoping that this new vendor makes cytology quicker and more accessible. Plus, science really needed a new vending machine, and I think the purple-white colour and stylized microscope are neat. Since the cytology lab is usually located very close to the slime pens, the addition of monkey cube boxes, xeno bags, and bio suits also helps support xenobiology projects. If the 14 cubes supplied at round start are insufficient (which they really shouldn't be) then they can supplement their supply with the boxes in the CytoPro. ## Changelog 🆑 add: A new vendor of cytology equipment, the CytoPro, is now available in your local science department! /🆑
This commit is contained in:
r3dj4ck0424
@@ -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" = (
|
||||
|
||||
@@ -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" = (
|
||||
|
||||
@@ -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" = (
|
||||
|
||||
@@ -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" = (
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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" = (
|
||||
|
||||
@@ -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" = (
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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)
|
||||
. = ..()
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -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)
|
||||
. = ..()
|
||||
|
||||
@@ -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"
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 117 KiB After Width: | Height: | Size: 118 KiB |
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user