diff --git a/code/__DEFINES/research.dm b/code/__DEFINES/research.dm index fd41c9abadc..0bf8cb1aa00 100644 --- a/code/__DEFINES/research.dm +++ b/code/__DEFINES/research.dm @@ -50,6 +50,7 @@ #define CELL_LINE_TABLE_MOIST "cell_line_moist_table" #define CELL_LINE_TABLE_BLOB "cell_line_blob_table" #define CELL_LINE_TABLE_CLOWN "cell_line_clown_table" +#define CELL_LINE_TABLE_ALGAE "cell_line_algae_table" //! Biopsy cell line types #define CELL_LINE_TABLE_BEAR "cell_line_bear_table" @@ -73,6 +74,11 @@ #define CELL_LINE_TABLE_VATBEAST "cell_line_vatbeast_table" #define CELL_LINE_TABLE_NETHER "cell_line_nether_table" #define CELL_LINE_TABLE_GLUTTON "cell_line_glutton_table" +#define CELL_LINE_TABLE_FROG "cell_line_frog_table" +#define CELL_LINE_TABLE_WALKING_MUSHROOM "cell_line_walking_mushroom_table" +#define CELL_LINE_TABLE_QUEEN_BEE "cell_line_bee_queen_table" +#define CELL_LINE_TABLE_LEAPER "cell_line_leaper_table" +#define CELL_LINE_TABLE_MEGA_ARACHNID "cell_line_table_mega_arachnid" //! All cell virus types #define CELL_VIRUS_TABLE_GENERIC "cell_virus_generic_table" diff --git a/code/_globalvars/lists/xenobiology.dm b/code/_globalvars/lists/xenobiology.dm index ad9511c5739..a4faab4c696 100644 --- a/code/_globalvars/lists/xenobiology.dm +++ b/code/_globalvars/lists/xenobiology.dm @@ -2,10 +2,37 @@ ///Assoc list of cell line define | assoc list of datum | cell_line GLOBAL_LIST_INIT_TYPED(cell_line_tables, /list, list( - CELL_LINE_TABLE_SLUDGE = list(/datum/micro_organism/cell_line/sholean_grapes = 2, /datum/micro_organism/cell_line/blobbernaut = 1, /datum/micro_organism/cell_line/slime = 2, /datum/micro_organism/cell_line/cow = 1, /datum/micro_organism/cell_line/mouse = 1, /datum/micro_organism/cell_line/chicken = 1, /datum/micro_organism/cell_line/cockroach = 2), - CELL_LINE_TABLE_MOIST = list(/datum/micro_organism/cell_line/gelatinous_cube = 2, /datum/micro_organism/cell_line/megacarp = 1, /datum/micro_organism/cell_line/slime = 2, /datum/micro_organism/cell_line/snake = 1, /datum/micro_organism/cell_line/carp = 1, /datum/micro_organism/cell_line/cockroach = 1), - CELL_LINE_TABLE_BLOB = list(/datum/micro_organism/cell_line/blobbernaut = 1, /datum/micro_organism/cell_line/blob_spore = 1), - CELL_LINE_TABLE_MOLD = list(/datum/micro_organism/cell_line/vat_beast = 2, /datum/micro_organism/cell_line/bear = 1, /datum/micro_organism/cell_line/slime = 1, /datum/micro_organism/cell_line/blob_spore = 1, /datum/micro_organism/cell_line/mouse = 2, /datum/micro_organism/cell_line/corgi = 1, /datum/micro_organism/cell_line/cockroach = 1, /datum/micro_organism/cell_line/cat = 1), + CELL_LINE_TABLE_SLUDGE = list( + /datum/micro_organism/cell_line/sholean_grapes = 2, + /datum/micro_organism/cell_line/blobbernaut = 1, + /datum/micro_organism/cell_line/slime = 2, + /datum/micro_organism/cell_line/cow = 1, + /datum/micro_organism/cell_line/mouse = 1, + /datum/micro_organism/cell_line/chicken = 1, + /datum/micro_organism/cell_line/cockroach = 2, + ), + + CELL_LINE_TABLE_MOIST = list( + /datum/micro_organism/cell_line/gelatinous_cube = 2, + /datum/micro_organism/cell_line/megacarp = 1, + /datum/micro_organism/cell_line/slime = 2, + /datum/micro_organism/cell_line/snake = 1, + /datum/micro_organism/cell_line/carp = 1, + /datum/micro_organism/cell_line/cockroach = 1), + + CELL_LINE_TABLE_BLOB = list(/datum/micro_organism/cell_line/blobbernaut = 1, + /datum/micro_organism/cell_line/blob_spore = 1), + + CELL_LINE_TABLE_MOLD = list( + /datum/micro_organism/cell_line/vat_beast = 2, + /datum/micro_organism/cell_line/bear = 1, + /datum/micro_organism/cell_line/slime = 1, + /datum/micro_organism/cell_line/blob_spore = 1, + /datum/micro_organism/cell_line/mouse = 2, + /datum/micro_organism/cell_line/corgi = 1, + /datum/micro_organism/cell_line/cockroach = 1, + /datum/micro_organism/cell_line/cat = 1), + CELL_LINE_TABLE_BEAR = list(/datum/micro_organism/cell_line/bear = 1), CELL_LINE_TABLE_BLOBBERNAUT = list(/datum/micro_organism/cell_line/blobbernaut = 1), CELL_LINE_TABLE_BLOBSPORE = list(/datum/micro_organism/cell_line/blob_spore = 1), @@ -26,8 +53,24 @@ GLOBAL_LIST_INIT_TYPED(cell_line_tables, /list, list( CELL_LINE_TABLE_SNAKE = list(/datum/micro_organism/cell_line/snake = 1), CELL_LINE_TABLE_VATBEAST = list(/datum/micro_organism/cell_line/vat_beast = 1), CELL_LINE_TABLE_NETHER = list(/datum/micro_organism/cell_line/netherworld = 1), - CELL_LINE_TABLE_CLOWN = list(/datum/micro_organism/cell_line/clown/bananaclown = 1, /datum/micro_organism/cell_line/clown/glutton = 1, /datum/micro_organism/cell_line/clown/longclown = 1), - CELL_LINE_TABLE_GLUTTON = list(/datum/micro_organism/cell_line/clown/glutton = 1) + CELL_LINE_TABLE_CLOWN = list( + /datum/micro_organism/cell_line/clown/bananaclown = 1, + /datum/micro_organism/cell_line/clown/glutton = 1, + /datum/micro_organism/cell_line/clown/longclown = 1), + + CELL_LINE_TABLE_GLUTTON = list(/datum/micro_organism/cell_line/clown/glutton = 1), + CELL_LINE_TABLE_FROG = list(/datum/micro_organism/cell_line/frog = 1), + CELL_LINE_TABLE_WALKING_MUSHROOM = list(/datum/micro_organism/cell_line/walking_mushroom = 1), + CELL_LINE_TABLE_QUEEN_BEE = list(/datum/micro_organism/cell_line/queen_bee = 1), + CELL_LINE_TABLE_LEAPER = list(/datum/micro_organism/cell_line/leaper = 1), + CELL_LINE_TABLE_MEGA_ARACHNID = list(/datum/micro_organism/cell_line/mega_arachnid = 1), + CELL_LINE_TABLE_ALGAE = list( + /datum/micro_organism/cell_line/frog = 2, + /datum/micro_organism/cell_line/snake = 1, + /datum/micro_organism/cell_line/queen_bee = 1, + /datum/micro_organism/cell_line/walking_mushroom = 2, + /datum/micro_organism/cell_line/leaper = 2, + /datum/micro_organism/cell_line/mega_arachnid = 1) )) ///Assoc list of cell virus define | assoc list of datum | cell_virus diff --git a/code/game/objects/effects/spawners/lootsite.dm b/code/game/objects/effects/spawners/lootsite.dm index e1668e60565..e3b85241d4b 100644 --- a/code/game/objects/effects/spawners/lootsite.dm +++ b/code/game/objects/effects/spawners/lootsite.dm @@ -3,12 +3,13 @@ icon = 'icons/effects/landmarks_static.dmi' icon_state = "loot_site" ///This is the loot table for the spawner. Try to make sure the weights add up to 1000, so it is easy to understand. - var/list/loot_table = list(/obj/structure/closet/crate/maint = 765, + var/list/loot_table = list(/obj/structure/closet/crate/maint = 745, /obj/structure/closet/crate/trashcart/filled = 75, /obj/effect/spawner/bundle/moisture_trap = 50, /obj/effect/spawner/bundle/hobo_squat = 30, /obj/structure/closet/mini_fridge = 35, /obj/effect/spawner/lootdrop/gross_decal_spawner = 30, + /obj/item/kirbyplants/fern = 20, /obj/structure/closet/crate/decorations = 15) diff --git a/code/game/objects/items/food/misc.dm b/code/game/objects/items/food/misc.dm index 80b123a2d9f..dc4d1ad523c 100644 --- a/code/game/objects/items/food/misc.dm +++ b/code/game/objects/items/food/misc.dm @@ -94,6 +94,10 @@ foodtypes = VEGETABLES w_class = WEIGHT_CLASS_SMALL +/obj/item/food/hugemushroomslice/Initialize(mapload) + . = ..() + AddElement(/datum/element/swabable, CELL_LINE_TABLE_WALKING_MUSHROOM, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5) + /obj/item/food/popcorn name = "popcorn" desc = "Now let's find some cinema." diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 428710cf905..014a9945d11 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -392,6 +392,16 @@ icon_state = "potty" trimmable = FALSE +/obj/item/kirbyplants/fern + name = "neglected fern" + desc = "An old botanical research sample collected on a long forgotten jungle planet." + icon_state = "fern" + trimmable = FALSE + +/obj/item/kirbyplants/fern/Initialize() + . = ..() + AddElement(/datum/element/swabable, CELL_LINE_TABLE_ALGAE, CELL_VIRUS_TABLE_GENERIC, 1, 5) + //a rock is flora according to where the icon file is //and now these defines diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm index 24f2bcca5f1..aaa21070346 100644 --- a/code/modules/mob/living/simple_animal/hostile/bees.dm +++ b/code/modules/mob/living/simple_animal/hostile/bees.dm @@ -66,6 +66,7 @@ AddElement(/datum/element/simple_flying) AddComponent(/datum/component/clickbox, x_offset = -2, y_offset = -2) AddComponent(/datum/component/swarming) + add_cell_sample() /mob/living/simple_animal/hostile/bee/mob_pickup(mob/living/L) if(flags_1 & HOLOGRAM_1) @@ -251,13 +252,16 @@ var/datum/reagent/R = pick(typesof(/datum/reagent/toxin)) assign_reagent(GLOB.chemical_reagents_list[R]) +/mob/living/simple_animal/hostile/bee/add_cell_sample() + . = ..() + AddElement(/datum/element/swabable, CELL_LINE_TABLE_QUEEN_BEE, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5) + /mob/living/simple_animal/hostile/bee/queen name = "queen bee" desc = "She's the queen of bees, BZZ BZZ!" icon_base = "queen" isqueen = TRUE - //the Queen doesn't leave the box on her own, and she CERTAINLY doesn't pollinate by herself /mob/living/simple_animal/hostile/bee/queen/Found(atom/A) return FALSE @@ -286,7 +290,6 @@ return TRUE return FALSE - /obj/item/queen_bee name = "queen bee" desc = "She's the queen of bees, BZZ BZZ!" @@ -321,12 +324,14 @@ to_chat(user, span_warning("You don't have enough units of that chemical to modify the bee's DNA!")) ..() +/obj/item/queen_bee/Initialize() + . = ..() + AddElement(/datum/element/swabable, CELL_LINE_TABLE_QUEEN_BEE, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5) /obj/item/queen_bee/bought/Initialize() . = ..() queen = new(src) - /obj/item/queen_bee/Destroy() QDEL_NULL(queen) return ..() @@ -357,6 +362,7 @@ /obj/item/trash/bee/Initialize() . = ..() AddComponent(/datum/component/edible, list(/datum/reagent/consumable/nutriment/vitamin = 5), null, RAW | MEAT | GROSS, 10, 0, list("bee"), null, 10) + AddElement(/datum/element/swabable, CELL_LINE_TABLE_QUEEN_BEE, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5) /obj/item/trash/bee/update_overlays() . = ..() diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm index 85c57cb3076..2ab8710894d 100644 --- a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm +++ b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm @@ -71,6 +71,10 @@ icon = 'icons/effects/tomatodecal.dmi' icon_state = "tomato_floor1" +/obj/effect/decal/cleanable/leaper_sludge/Initialize(mapload, list/datum/disease/diseases) + . = ..() + AddElement(/datum/element/swabable, CELL_LINE_TABLE_LEAPER, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5) + /obj/structure/leaper_bubble name = "leaper bubble" desc = "A floating bubble containing leaper venom. The contents are under a surprising amount of pressure." @@ -86,6 +90,7 @@ COMSIG_ATOM_ENTERED = .proc/on_entered, ) AddElement(/datum/element/connect_loc, loc_connections) + AddElement(/datum/element/swabable, CELL_LINE_TABLE_LEAPER, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5) /obj/structure/leaper_bubble/ComponentInitialize() . = ..() @@ -140,6 +145,7 @@ /mob/living/simple_animal/hostile/jungle/leaper/Initialize() . = ..() remove_verb(src, /mob/living/verb/pulled) + add_cell_sample() /mob/living/simple_animal/hostile/jungle/leaper/CtrlClickOn(atom/A) face_atom(A) @@ -273,4 +279,8 @@ return icon_state = "leaper" +/mob/living/simple_animal/hostile/jungle/leaper/add_cell_sample() + . = ..() + AddElement(/datum/element/swabable, CELL_LINE_TABLE_LEAPER, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5) + #undef PLAYER_HOP_DELAY diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm b/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm index 5075b22891c..3e36234de5d 100644 --- a/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm +++ b/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm @@ -50,6 +50,14 @@ ..() alpha = 50 +/mob/living/simple_animal/hostile/jungle/mega_arachnid/Initialize(mapload) + . = ..() + add_cell_sample() + +/mob/living/simple_animal/hostile/jungle/mega_arachnid/add_cell_sample() + . = ..() + AddElement(/datum/element/swabable, CELL_LINE_TABLE_MEGA_ARACHNID, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5) + /obj/projectile/mega_arachnid name = "flesh snare" nodamage = TRUE @@ -71,3 +79,7 @@ flags_1 = NONE icon_state = "flesh_snare" armed = TRUE + +/obj/item/restraints/legcuffs/beartrap/mega_arachnid/Initialize(mapload) + . = ..() + AddElement(/datum/element/swabable, CELL_LINE_TABLE_MEGA_ARACHNID, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5) diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm index a4aaa508e1c..d05391aa93f 100644 --- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm +++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm @@ -65,6 +65,7 @@ cap_color = rgb(rand(0, 255), rand(0, 255), rand(0, 255)) UpdateMushroomCap() health = maxHealth + add_cell_sample() . = ..() ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) @@ -196,3 +197,7 @@ S.reagents.add_reagent(/datum/reagent/drug/mushroomhallucinogen, powerlevel) S.reagents.add_reagent(/datum/reagent/medicine/omnizine, powerlevel) S.reagents.add_reagent(/datum/reagent/medicine/synaptizine, powerlevel) + +/mob/living/simple_animal/hostile/mushroom/add_cell_sample() + . = ..() + AddElement(/datum/element/swabable, CELL_LINE_TABLE_WALKING_MUSHROOM, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5) diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm index 76b0098e09e..bb6c96759b3 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm @@ -47,6 +47,7 @@ COMSIG_ATOM_ENTERED = .proc/on_entered, ) AddElement(/datum/element/connect_loc, loc_connections) + add_cell_sample() /mob/living/simple_animal/hostile/retaliate/frog/proc/on_entered(datum/source, AM as mob|obj) SIGNAL_HANDLER @@ -54,3 +55,7 @@ var/mob/living/L = AM if(L.mob_size > MOB_SIZE_TINY) playsound(src, stepped_sound, 50, TRUE) + +/mob/living/simple_animal/hostile/retaliate/frog/add_cell_sample() + . = ..() + AddElement(/datum/element/swabable, CELL_LINE_TABLE_FROG, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5) diff --git a/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm b/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm index 9f060524007..1b576355e3a 100644 --- a/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm +++ b/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm @@ -8,21 +8,21 @@ desc = "Murine cells" required_reagents = list(/datum/reagent/consumable/nutriment/protein) supplementary_reagents = list( - /datum/reagent/growthserum = 2, - /datum/reagent/liquidgibs = 2, - /datum/reagent/consumable/cornoil = 2, - /datum/reagent/consumable/nutriment = 1, - /datum/reagent/consumable/nutriment/vitamin = 1, - /datum/reagent/consumable/sugar = 1, - /datum/reagent/consumable/cooking_oil = 1, - /datum/reagent/consumable/rice = 1, - /datum/reagent/consumable/eggyolk = 1) + /datum/reagent/growthserum = 2, + /datum/reagent/liquidgibs = 2, + /datum/reagent/consumable/cornoil = 2, + /datum/reagent/consumable/nutriment = 1, + /datum/reagent/consumable/nutriment/vitamin = 1, + /datum/reagent/consumable/sugar = 1, + /datum/reagent/consumable/cooking_oil = 1, + /datum/reagent/consumable/rice = 1, + /datum/reagent/consumable/eggyolk = 1) suppressive_reagents = list( - /datum/reagent/toxin/heparin = -6, - /datum/reagent/consumable/astrotame = -4, //Saccarin gives rats cancer. - /datum/reagent/consumable/ethanol/rubberneck = -3, - /datum/reagent/consumable/grey_bull = -1) + /datum/reagent/toxin/heparin = -6, + /datum/reagent/consumable/astrotame = -4, //Saccarin gives rats cancer. + /datum/reagent/consumable/ethanol/rubberneck = -3, + /datum/reagent/consumable/grey_bull = -1) virus_suspectibility = 2 growth_rate = VAT_GROWTH_RATE @@ -31,14 +31,16 @@ /datum/micro_organism/cell_line/chicken //basic cell line designed as a good source of protein and eggyolk. desc = "Galliform skin cells." required_reagents = list(/datum/reagent/consumable/nutriment/protein) - supplementary_reagents = list( - /datum/reagent/consumable/rice = 4, - /datum/reagent/growthserum = 3, - /datum/reagent/consumable/eggyolk = 1, - /datum/reagent/consumable/nutriment/vitamin = 2) - suppressive_reagents = list(/datum/reagent/fuel/oil = -4, - /datum/reagent/toxin = -2) + supplementary_reagents = list( + /datum/reagent/consumable/rice = 4, + /datum/reagent/growthserum = 3, + /datum/reagent/consumable/eggyolk = 1, + /datum/reagent/consumable/nutriment/vitamin = 2) + + suppressive_reagents = list( + /datum/reagent/fuel/oil = -4, + /datum/reagent/toxin = -2) virus_suspectibility = 1 growth_rate = VAT_GROWTH_RATE @@ -47,18 +49,18 @@ /datum/micro_organism/cell_line/cow desc = "Bovine stem cells" required_reagents = list( - /datum/reagent/consumable/nutriment/protein, - /datum/reagent/consumable/nutriment, - /datum/reagent/cellulose) + /datum/reagent/consumable/nutriment/protein, + /datum/reagent/consumable/nutriment, + /datum/reagent/cellulose) supplementary_reagents = list( - /datum/reagent/growthserum = 4, - /datum/reagent/consumable/nutriment/vitamin = 2, - /datum/reagent/consumable/rice = 2, - /datum/reagent/consumable/flour = 1) + /datum/reagent/growthserum = 4, + /datum/reagent/consumable/nutriment/vitamin = 2, + /datum/reagent/consumable/rice = 2, + /datum/reagent/consumable/flour = 1) suppressive_reagents = list(/datum/reagent/toxin = -2, - /datum/reagent/toxin/carpotoxin = -5) + /datum/reagent/toxin/carpotoxin = -5) virus_suspectibility = 1 resulting_atoms = list(/mob/living/basic/cow = 1) @@ -91,19 +93,20 @@ /datum/micro_organism/cell_line/cat desc = "Feliform cells" required_reagents = list( - /datum/reagent/consumable/nutriment/protein, - /datum/reagent/liquidgibs - ) + /datum/reagent/consumable/nutriment/protein, + /datum/reagent/liquidgibs) + supplementary_reagents = list( - /datum/reagent/growthserum = 3, - /datum/reagent/consumable/nutriment/vitamin = 2, - /datum/reagent/medicine/oculine = 2, - /datum/reagent/consumable/milk = 1) //milkies + /datum/reagent/growthserum = 3, + /datum/reagent/consumable/nutriment/vitamin = 2, + /datum/reagent/medicine/oculine = 2, + /datum/reagent/consumable/milk = 1) //milkies + suppressive_reagents = list( - /datum/reagent/consumable/coco = -4, - /datum/reagent/consumable/hot_coco = -2, - /datum/reagent/consumable/chocolatepudding = -2, - /datum/reagent/consumable/milk/chocolate_milk = -1) + /datum/reagent/consumable/coco = -4, + /datum/reagent/consumable/hot_coco = -2, + /datum/reagent/consumable/chocolatepudding = -2, + /datum/reagent/consumable/milk/chocolate_milk = -1) virus_suspectibility = 1.5 resulting_atoms = list(/mob/living/simple_animal/pet/cat = 1) //The basic cat mobs are all male, so you mightt need a gender swap potion if you want to fill the fortress with kittens. @@ -111,35 +114,36 @@ /datum/micro_organism/cell_line/corgi desc = "Canid cells" required_reagents = list( - /datum/reagent/consumable/nutriment/protein, - /datum/reagent/liquidgibs) + /datum/reagent/consumable/nutriment/protein, + /datum/reagent/liquidgibs) supplementary_reagents = list( - /datum/reagent/growthserum = 3, - /datum/reagent/barbers_aid = 3, - /datum/reagent/consumable/nutriment/vitamin = 2) + /datum/reagent/growthserum = 3, + /datum/reagent/barbers_aid = 3, + /datum/reagent/consumable/nutriment/vitamin = 2) suppressive_reagents = list( - /datum/reagent/consumable/garlic = -2, - /datum/reagent/consumable/tearjuice = -3, - /datum/reagent/consumable/coco = -2) + /datum/reagent/consumable/garlic = -2, + /datum/reagent/consumable/tearjuice = -3, + /datum/reagent/consumable/coco = -2) + virus_suspectibility = 1 resulting_atoms = list(/mob/living/simple_animal/pet/dog/corgi = 1) /datum/micro_organism/cell_line/pug desc = "Squat canid cells" required_reagents = list( - /datum/reagent/consumable/nutriment/protein, - /datum/reagent/liquidgibs) + /datum/reagent/consumable/nutriment/protein, + /datum/reagent/liquidgibs) supplementary_reagents = list( - /datum/reagent/growthserum = 2, - /datum/reagent/consumable/nutriment/vitamin = 3) + /datum/reagent/growthserum = 2, + /datum/reagent/consumable/nutriment/vitamin = 3) suppressive_reagents = list( - /datum/reagent/consumable/garlic = -2, - /datum/reagent/consumable/tearjuice = -3, - /datum/reagent/consumable/coco = -2) + /datum/reagent/consumable/garlic = -2, + /datum/reagent/consumable/tearjuice = -3, + /datum/reagent/consumable/coco = -2) virus_suspectibility = 3 resulting_atoms = list(/mob/living/simple_animal/pet/dog/pug = 1) @@ -147,20 +151,20 @@ /datum/micro_organism/cell_line/bear //bears can't really compete directly with more powerful creatures, so i made it possible to grow them real fast. desc = "Ursine cells" required_reagents = list( - /datum/reagent/consumable/nutriment/protein, - /datum/reagent/liquidgibs, - /datum/reagent/medicine/c2/synthflesh) //Nuke this if the dispenser becomes xenobio meta. + /datum/reagent/consumable/nutriment/protein, + /datum/reagent/liquidgibs, + /datum/reagent/medicine/c2/synthflesh) //Nuke this if the dispenser becomes xenobio meta. supplementary_reagents = list( - /datum/reagent/consumable/honey = 8, //Hunny. - /datum/reagent/growthserum = 5, - /datum/reagent/medicine/morphine = 4, //morphine is a vital nutrient for space bears, but it is better as a supplemental for gameplay reasons. - /datum/reagent/consumable/nutriment/vitamin = 3) + /datum/reagent/consumable/honey = 8, //Hunny. + /datum/reagent/growthserum = 5, + /datum/reagent/medicine/morphine = 4, //morphine is a vital nutrient for space bears, but it is better as a supplemental for gameplay reasons. + /datum/reagent/consumable/nutriment/vitamin = 3) suppressive_reagents = list( - /datum/reagent/consumable/condensedcapsaicin = -4, //bear mace, steal it from the sec checkpoint. - /datum/reagent/toxin/carpotoxin = -2, - /datum/reagent/medicine/insulin = -2) //depletes hunny. + /datum/reagent/consumable/condensedcapsaicin = -4, //bear mace, steal it from the sec checkpoint. + /datum/reagent/toxin/carpotoxin = -2, + /datum/reagent/medicine/insulin = -2) //depletes hunny. virus_suspectibility = 2 resulting_atoms = list(/mob/living/simple_animal/hostile/bear = 1) @@ -168,19 +172,19 @@ /datum/micro_organism/cell_line/carp desc = "Cyprinid cells" required_reagents = list( - /datum/reagent/consumable/nutriment/protein, - /datum/reagent/consumable/nutriment) + /datum/reagent/consumable/nutriment/protein, + /datum/reagent/consumable/nutriment) supplementary_reagents = list( - /datum/reagent/consumable/cornoil = 4, //Carp are oily fish - /datum/reagent/toxin/carpotoxin = 3, - /datum/reagent/consumable/cooking_oil = 2, - /datum/reagent/consumable/nutriment/vitamin = 2) + /datum/reagent/consumable/cornoil = 4, //Carp are oily fish + /datum/reagent/toxin/carpotoxin = 3, + /datum/reagent/consumable/cooking_oil = 2, + /datum/reagent/consumable/nutriment/vitamin = 2) suppressive_reagents = list( - /datum/reagent/toxin/bungotoxin = -6, - /datum/reagent/mercury = -4, - /datum/reagent/oxygen = -3) + /datum/reagent/toxin/bungotoxin = -6, + /datum/reagent/mercury = -4, + /datum/reagent/oxygen = -3) virus_suspectibility = 2 resulting_atoms = list(/mob/living/simple_animal/hostile/carp = 1) @@ -188,20 +192,20 @@ /datum/micro_organism/cell_line/megacarp desc = "Cartilaginous cyprinid cells" required_reagents = list( - /datum/reagent/consumable/nutriment/protein, - /datum/reagent/medicine/c2/synthflesh, - /datum/reagent/consumable/nutriment) + /datum/reagent/consumable/nutriment/protein, + /datum/reagent/medicine/c2/synthflesh, + /datum/reagent/consumable/nutriment) supplementary_reagents = list( - /datum/reagent/consumable/cornoil = 4, - /datum/reagent/growthserum = 3, - /datum/reagent/toxin/carpotoxin = 2, - /datum/reagent/consumable/cooking_oil = 2, - /datum/reagent/consumable/nutriment/vitamin = 2) + /datum/reagent/consumable/cornoil = 4, + /datum/reagent/growthserum = 3, + /datum/reagent/toxin/carpotoxin = 2, + /datum/reagent/consumable/cooking_oil = 2, + /datum/reagent/consumable/nutriment/vitamin = 2) suppressive_reagents = list( - /datum/reagent/toxin/bungotoxin = -6, - /datum/reagent/oxygen = -3) + /datum/reagent/toxin/bungotoxin = -6, + /datum/reagent/oxygen = -3) virus_suspectibility = 1 resulting_atoms = list(/mob/living/simple_animal/hostile/carp/megacarp = 1) @@ -209,18 +213,18 @@ /datum/micro_organism/cell_line/snake desc = "Ophidic cells" required_reagents = list( - /datum/reagent/consumable/nutriment/protein, - /datum/reagent/liquidgibs) + /datum/reagent/consumable/nutriment/protein, + /datum/reagent/liquidgibs) supplementary_reagents = list( - /datum/reagent/growthserum = 3, - /datum/reagent/consumable/nutriment/peptides = 3, - /datum/reagent/consumable/eggyolk = 2, - /datum/reagent/consumable/nutriment/vitamin = 2) + /datum/reagent/growthserum = 3, + /datum/reagent/consumable/nutriment/peptides = 3, + /datum/reagent/consumable/eggyolk = 2, + /datum/reagent/consumable/nutriment/vitamin = 2) suppressive_reagents = list( - /datum/reagent/consumable/corn_syrup = -6, - /datum/reagent/sulfur = -3) //sulfur repels snakes according to professor google. + /datum/reagent/consumable/corn_syrup = -6, + /datum/reagent/sulfur = -3) //sulfur repels snakes according to professor google. resulting_atoms = list(/mob/living/simple_animal/hostile/retaliate/snake = 1) @@ -236,14 +240,13 @@ supplementary_reagents = list( /datum/reagent/toxin/slimejelly = 2, /datum/reagent/liquidgibs = 2, - /datum/reagent/consumable/enzyme = 1, - ) + /datum/reagent/consumable/enzyme = 1) suppressive_reagents = list( - /datum/reagent/consumable/frostoil = -4, - /datum/reagent/cryostylane = -4, - /datum/reagent/medicine/morphine = -2, - /datum/reagent/consumable/ice = -2) //Brrr! + /datum/reagent/consumable/frostoil = -4, + /datum/reagent/cryostylane = -4, + /datum/reagent/medicine/morphine = -2, + /datum/reagent/consumable/ice = -2) //Brrr! virus_suspectibility = 0 resulting_atoms = list(/mob/living/simple_animal/slime = 1) @@ -255,13 +258,12 @@ supplementary_reagents = list( /datum/reagent/consumable/nutriment/vitamin = 3, /datum/reagent/liquidgibs = 2, - /datum/reagent/sulfur = 2, - ) + /datum/reagent/sulfur = 2) suppressive_reagents = list( /datum/reagent/consumable/tinlux = -6, - /datum/reagent/napalm = -4, - ) + /datum/reagent/napalm = -4) + virus_suspectibility = 0 resulting_atoms = list(/mob/living/simple_animal/hostile/blob/blobspore/independent = 2) //These are useless so we might as well spawn 2. @@ -270,16 +272,14 @@ required_reagents = list( /datum/reagent/consumable/nutriment/protein, /datum/reagent/medicine/c2/synthflesh, - /datum/reagent/sulfur, - ) //grind flares to get this + /datum/reagent/sulfur) //grind flares to get this supplementary_reagents = list( /datum/reagent/growthserum = 3, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/liquidgibs = 2, /datum/reagent/consumable/eggyolk = 2, - /datum/reagent/consumable/shamblers = 1, - ) + /datum/reagent/consumable/shamblers = 1) suppressive_reagents = list(/datum/reagent/consumable/tinlux = -6) @@ -292,8 +292,7 @@ /datum/reagent/consumable/nutriment/protein, /datum/reagent/toxin/slimejelly, /datum/reagent/yuck, - /datum/reagent/consumable/enzyme, - ) //Powerful enzymes helps the cube digest prey. + /datum/reagent/consumable/enzyme) //Powerful enzymes helps the cube digest prey. supplementary_reagents = list( /datum/reagent/water/hollowwater = 4, @@ -302,14 +301,13 @@ /datum/reagent/consumable/nutriment/peptides = 2, /datum/reagent/consumable/potato_juice = 1, /datum/reagent/liquidgibs = 1, - /datum/reagent/consumable/nutriment/vitamin = 1, - ) + /datum/reagent/consumable/nutriment/vitamin = 1) suppressive_reagents = list( /datum/reagent/toxin/minttoxin = -3, /datum/reagent/consumable/frostoil = -2, - /datum/reagent/consumable/ice = -1, - ) + /datum/reagent/consumable/ice = -1) + virus_suspectibility = 0 resulting_atoms = list(/mob/living/simple_animal/hostile/ooze/gelatinous = 1) @@ -319,24 +317,24 @@ /datum/reagent/consumable/nutriment/protein, /datum/reagent/toxin/slimejelly, /datum/reagent/yuck, - /datum/reagent/consumable/vitfro, - ) + /datum/reagent/consumable/vitfro) supplementary_reagents = list( - /datum/reagent/medicine/omnizine = 4, - /datum/reagent/consumable/nutriment/peptides = 3, - /datum/reagent/consumable/corn_syrup = 2, - /datum/reagent/consumable/ethanol/squirt_cider = 2, - /datum/reagent/consumable/doctor_delight = 1, - /datum/reagent/medicine/salglu_solution = 1, - /datum/reagent/liquidgibs = 1, - /datum/reagent/consumable/nutriment/vitamin = 1) + /datum/reagent/medicine/omnizine = 4, + /datum/reagent/consumable/nutriment/peptides = 3, + /datum/reagent/consumable/corn_syrup = 2, + /datum/reagent/consumable/ethanol/squirt_cider = 2, + /datum/reagent/consumable/doctor_delight = 1, + /datum/reagent/medicine/salglu_solution = 1, + /datum/reagent/liquidgibs = 1, + /datum/reagent/consumable/nutriment/vitamin = 1) suppressive_reagents = list( - /datum/reagent/toxin/carpotoxin = -3, - /datum/reagent/toxin/coffeepowder = -2, - /datum/reagent/consumable/frostoil = -2, - /datum/reagent/consumable/ice = -1) + /datum/reagent/toxin/carpotoxin = -3, + /datum/reagent/toxin/coffeepowder = -2, + /datum/reagent/consumable/frostoil = -2, + /datum/reagent/consumable/ice = -1) + virus_suspectibility = 0 resulting_atoms = list(/mob/living/simple_animal/hostile/ooze/grapes = 1) @@ -347,15 +345,15 @@ desc = "Blattodeoid anthropod cells" required_reagents = list(/datum/reagent/consumable/nutriment/protein) supplementary_reagents = list( - /datum/reagent/yuck = 4, - /datum/reagent/growthserum = 2, - /datum/reagent/toxin/slimejelly = 2, - /datum/reagent/consumable/nutriment/vitamin = 1) + /datum/reagent/yuck = 4, + /datum/reagent/growthserum = 2, + /datum/reagent/toxin/slimejelly = 2, + /datum/reagent/consumable/nutriment/vitamin = 1) suppressive_reagents = list( - /datum/reagent/toxin/pestkiller = -2, - /datum/reagent/consumable/poisonberryjuice = -4, - /datum/reagent/consumable/ethanol/bug_spray = -4) + /datum/reagent/toxin/pestkiller = -2, + /datum/reagent/consumable/poisonberryjuice = -4, + /datum/reagent/consumable/ethanol/bug_spray = -4) virus_suspectibility = 0 resulting_atoms = list(/mob/living/basic/cockroach = 5) @@ -363,44 +361,46 @@ /datum/micro_organism/cell_line/pine desc = "Coniferous plant cells" required_reagents = list( - /datum/reagent/ammonia, - /datum/reagent/ash, - /datum/reagent/plantnutriment/robustharvestnutriment) //A proper source of phosphorous like would be thematically more appropriate but this is what we have. + /datum/reagent/ammonia, + /datum/reagent/ash, + /datum/reagent/plantnutriment/robustharvestnutriment) //A proper source of phosphorous like would be thematically more appropriate but this is what we have. supplementary_reagents = list( - /datum/reagent/saltpetre = 5, - /datum/reagent/carbondioxide = 2, - /datum/reagent/consumable/nutriment = 2, - /datum/reagent/consumable/space_cola = 2, //A little extra phosphorous - /datum/reagent/water/holywater = 2, - /datum/reagent/water = 1, - /datum/reagent/cellulose = 1) + /datum/reagent/saltpetre = 5, + /datum/reagent/carbondioxide = 2, + /datum/reagent/consumable/nutriment = 2, + /datum/reagent/consumable/space_cola = 2, //A little extra phosphorous + /datum/reagent/water/holywater = 2, + /datum/reagent/water = 1, + /datum/reagent/cellulose = 1) suppressive_reagents = list(/datum/reagent/toxin/plantbgone = -8) + virus_suspectibility = 1 resulting_atoms = list(/mob/living/simple_animal/hostile/tree = 1) /datum/micro_organism/cell_line/vat_beast desc = "Hypergenic xenocytes" required_reagents = list( - /datum/reagent/consumable/nutriment/protein, - /datum/reagent/consumable/nutriment/vitamin, - /datum/reagent/consumable/nutriment/peptides, - /datum/reagent/consumable/liquidelectricity/enriched, - /datum/reagent/growthserum, - /datum/reagent/yuck) + /datum/reagent/consumable/nutriment/protein, + /datum/reagent/consumable/nutriment/vitamin, + /datum/reagent/consumable/nutriment/peptides, + /datum/reagent/consumable/liquidelectricity/enriched, + /datum/reagent/growthserum, + /datum/reagent/yuck) supplementary_reagents = list( - /datum/reagent/medicine/rezadone = 3, - /datum/reagent/consumable/entpoly = 3, - /datum/reagent/consumable/red_queen = 2, - /datum/reagent/consumable/peachjuice = 2, - /datum/reagent/uranium = 1, - /datum/reagent/liquidgibs = 1) + /datum/reagent/medicine/rezadone = 3, + /datum/reagent/consumable/entpoly = 3, + /datum/reagent/consumable/red_queen = 2, + /datum/reagent/consumable/peachjuice = 2, + /datum/reagent/uranium = 1, + /datum/reagent/liquidgibs = 1) suppressive_reagents = list( - /datum/reagent/consumable/salt = -3, - /datum/reagent/medicine/c2/syriniver = -2) + /datum/reagent/consumable/salt = -3, + /datum/reagent/medicine/c2/syriniver = -2) + virus_suspectibility = 0.5 resulting_atoms = list(/mob/living/simple_animal/hostile/vatbeast = 1) @@ -412,22 +412,22 @@ /datum/micro_organism/cell_line/netherworld desc = "Aberrant residue" required_reagents = list(//theme here: very odd requirements - /datum/reagent/water/hollowwater,//geyser reagent, so plentiful when found - /datum/reagent/consumable/ethanol/wizz_fizz, //EZ bartender drink, like brainless - /datum/reagent/yuck) //since the other two are easy to make tons of, this is kind of a limiter + /datum/reagent/water/hollowwater,//geyser reagent, so plentiful when found + /datum/reagent/consumable/ethanol/wizz_fizz, //EZ bartender drink, like brainless + /datum/reagent/yuck) //since the other two are easy to make tons of, this is kind of a limiter supplementary_reagents = list( //all of these are just geyser stuff, rated by their rarity - /datum/reagent/wittel = 10, //stupid rare - /datum/reagent/medicine/omnizine/protozine = 5, - /datum/reagent/plasma_oxide = 3, - /datum/reagent/clf3 = 1)//since this is also chemistry it's worth near nothing + /datum/reagent/wittel = 10, //stupid rare + /datum/reagent/medicine/omnizine/protozine = 5, + /datum/reagent/plasma_oxide = 3, + /datum/reagent/clf3 = 1)//since this is also chemistry it's worth near nothing suppressive_reagents = list(//generics you would regularly put in a vat kill abberant residue - /datum/reagent/consumable/nutriment/peptides = -6, - /datum/reagent/consumable/nutriment/protein = -4, - /datum/reagent/consumable/nutriment = -3, - /datum/reagent/liquidgibs = -2 - ) + /datum/reagent/consumable/nutriment/peptides = -6, + /datum/reagent/consumable/nutriment/protein = -4, + /datum/reagent/consumable/nutriment = -3, + /datum/reagent/liquidgibs = -2) + virus_suspectibility = 0 resulting_atoms = list(/mob/living/simple_animal/hostile/netherworld = 1) @@ -449,23 +449,22 @@ desc = "Clown bits with banana chunks" required_reagents = list( - /datum/reagent/consumable/nutriment/protein, - /datum/reagent/consumable/banana) + /datum/reagent/consumable/nutriment/protein, + /datum/reagent/consumable/banana) supplementary_reagents = list( - /datum/reagent/saltpetre = 4, - /datum/reagent/ammonia = 3, - /datum/reagent/carbondioxide = 3, - /datum/reagent/medicine/coagulant/banana_peel = 2, - /datum/reagent/plantnutriment/robustharvestnutriment = 1) + /datum/reagent/saltpetre = 4, + /datum/reagent/ammonia = 3, + /datum/reagent/carbondioxide = 3, + /datum/reagent/medicine/coagulant/banana_peel = 2, + /datum/reagent/plantnutriment/robustharvestnutriment = 1) suppressive_reagents = list( - /datum/reagent/consumable/clownstears = -8, - /datum/reagent/toxin/plantbgone = -4, - /datum/reagent/consumable/ethanol/silencer = -3, - /datum/reagent/consumable/nothing = -2, - /datum/reagent/fuel/oil = -1) - + /datum/reagent/consumable/clownstears = -8, + /datum/reagent/toxin/plantbgone = -4, + /datum/reagent/consumable/ethanol/silencer = -3, + /datum/reagent/consumable/nothing = -2, + /datum/reagent/fuel/oil = -1) resulting_atoms = list(/mob/living/simple_animal/hostile/retaliate/clown/banana = 1) @@ -473,27 +472,26 @@ desc = "hyperadipogenic clown stem cells" required_reagents = list( - /datum/reagent/consumable/nutriment/protein, - /datum/reagent/consumable/banana, - /datum/reagent/medicine/c2/synthflesh) + /datum/reagent/consumable/nutriment/protein, + /datum/reagent/consumable/banana, + /datum/reagent/medicine/c2/synthflesh) //r/chonkers supplementary_reagents = list( - /datum/reagent/consumable/vanillapudding = 8, - /datum/reagent/growthserum = 6, - /datum/reagent/consumable/nutriment/peptides = 4, - /datum/reagent/consumable/cornoil = 3, - /datum/reagent/consumable/cooking_oil = 1, - /datum/reagent/consumable/space_cola = 1) + /datum/reagent/consumable/vanillapudding = 8, + /datum/reagent/growthserum = 6, + /datum/reagent/consumable/nutriment/peptides = 4, + /datum/reagent/consumable/cornoil = 3, + /datum/reagent/consumable/cooking_oil = 1, + /datum/reagent/consumable/space_cola = 1) suppressive_reagents = list( - /datum/reagent/consumable/clownstears = -8, - /datum/reagent/toxin/minttoxin = -6, - /datum/reagent/consumable/ethanol/silencer = -3, - /datum/reagent/consumable/ethanol/fernet = -3, - /datum/reagent/toxin/lipolicide = -3, - /datum/reagent/consumable/nothing = -2, - /datum/reagent/toxin/bad_food = -1) - + /datum/reagent/consumable/clownstears = -8, + /datum/reagent/toxin/minttoxin = -6, + /datum/reagent/consumable/ethanol/silencer = -3, + /datum/reagent/consumable/ethanol/fernet = -3, + /datum/reagent/toxin/lipolicide = -3, + /datum/reagent/consumable/nothing = -2, + /datum/reagent/toxin/bad_food = -1) resulting_atoms = list(/mob/living/simple_animal/hostile/retaliate/clown/mutant/glutton = 1) @@ -501,23 +499,150 @@ desc = "long clown bits" required_reagents = list( - /datum/reagent/consumable/nutriment/protein, - /datum/reagent/consumable/banana) + /datum/reagent/consumable/nutriment/protein, + /datum/reagent/consumable/banana) supplementary_reagents = list( - /datum/reagent/drug/happiness = 5, - /datum/reagent/toxin/mimesbane = 4, - /datum/reagent/consumable/laughter = 3, - /datum/reagent/nitrous_oxide = 2) + /datum/reagent/drug/happiness = 5, + /datum/reagent/toxin/mimesbane = 4, + /datum/reagent/consumable/laughter = 3, + /datum/reagent/nitrous_oxide = 2) suppressive_reagents = list( - /datum/reagent/consumable/clownstears = -8, - /datum/reagent/consumable/ethanol/beepsky_smash = -3, - /datum/reagent/consumable/ethanol/silencer = -3, - /datum/reagent/toxin/mutetoxin = -3, - /datum/reagent/consumable/nothing = -2, - /datum/reagent/sulfur = -1) + /datum/reagent/consumable/clownstears = -8, + /datum/reagent/consumable/ethanol/beepsky_smash = -3, + /datum/reagent/consumable/ethanol/silencer = -3, + /datum/reagent/toxin/mutetoxin = -3, + /datum/reagent/consumable/nothing = -2, + /datum/reagent/sulfur = -1) resulting_atoms = list(/mob/living/simple_animal/hostile/retaliate/clown/longface = 1) +/datum/micro_organism/cell_line/frog + desc = "amphibian cells" + required_reagents = list(/datum/reagent/consumable/nutriment/protein) + + supplementary_reagents = list( + /datum/reagent/ants = 3, + /datum/reagent/consumable/eggwhite= 2, + /datum/reagent/consumable/nutriment/vitamin = 1,) + + suppressive_reagents = list( + /datum/reagent/toxin/carpotoxin = -3, + /datum/reagent/toxin/bungotoxin = -3, + /datum/reagent/toxin/spore = -3, + /datum/reagent/toxin/plantbgone = -2, //GAY FROGS + /datum/reagent/drying_agent = -2, + /datum/reagent/consumable/mold = -2, + /datum/reagent/toxin = -1) + + virus_suspectibility = 0.5 + resulting_atoms = list(/mob/living/simple_animal/hostile/retaliate/frog = 1) + +/datum/micro_organism/cell_line/walking_mushroom + desc = "motile fungal hyphae" + required_reagents = list(/datum/reagent/consumable/nutriment/protein) + + supplementary_reagents = list( + /datum/reagent/toxin/polonium = 6, + /datum/reagent/consumable/corn_syrup = 3, + /datum/reagent/consumable/mushroom_tea = 3, + /datum/reagent/toxin/coffeepowder = 2, + /datum/reagent/consumable/nuka_cola = 2, + /datum/reagent/consumable/mold = 2, + /datum/reagent/consumable/sugar = 1, + /datum/reagent/cellulose = 1) + + suppressive_reagents = list( + /datum/reagent/lead = -4, + /datum/reagent/consumable/garlic = -3, + /datum/reagent/toxin/plasma = -2, + /datum/reagent/flash_powder = -2, + /datum/reagent/pax = -2, + /datum/reagent/copper = -1) + + virus_suspectibility = 0 + resulting_atoms = list(/mob/living/simple_animal/hostile/mushroom = 1) + +/datum/micro_organism/cell_line/queen_bee + desc = "aphid cells" + required_reagents = list( + /datum/reagent/consumable/nutriment/protein, + /datum/reagent/consumable/corn_syrup) + + supplementary_reagents = list( + /datum/reagent/consumable/honey = 4, + /datum/reagent/consumable/korta_nectar = 3, + /datum/reagent/consumable/red_queen = 3, + /datum/reagent/consumable/ethanol/champagne = 2, + /datum/reagent/consumable/ethanol/sugar_rush = 2, + /datum/reagent/consumable/sugar = 1, + /datum/reagent/consumable/lemonade = 1, + /datum/reagent/consumable/nutriment/vitamin = 1) + + suppressive_reagents = list( + /datum/reagent/toxin/carpotoxin = -3, + /datum/reagent/toxin/pestkiller = -2, + /datum/reagent/consumable/potato_juice = -2, + /datum/reagent/drug/nicotine = -1) + + virus_suspectibility = 0 + resulting_atoms = list(/obj/item/queen_bee = 1) + +/datum/micro_organism/cell_line/queen_bee/fuck_up_growing(obj/machinery/plumbing/growing_vat/vat) //we love job hazards + vat.visible_message(span_warning("You hear angry buzzing coming from the inside of the vat!")) + QDEL_NULL(vat.biological_sample) + for(var/i in 1 to 5) + new /mob/living/simple_animal/hostile/bee(get_turf(vat)) + +/datum/micro_organism/cell_line/leaper + desc = "atypical amphibian cells" + required_reagents = list( + /datum/reagent/consumable/nutriment/protein, + /datum/reagent/ants, + /datum/reagent/consumable/eggyolk, + /datum/reagent/medicine/c2/synthflesh) + + supplementary_reagents = list( + /datum/reagent/growthserum = 4, + /datum/reagent/drug/blastoff = 3, + /datum/reagent/drug/space_drugs = 2, + /datum/reagent/consumable/ethanol/eggnog = 2, + /datum/reagent/consumable/vanilla = 2, + /datum/reagent/consumable/banana = 1, + /datum/reagent/consumable/nutriment/vitamin = 1) + + suppressive_reagents = list( + /datum/reagent/toxin/cyanide = -5, + /datum/reagent/consumable/mold = -2, + /datum/reagent/toxin/spore = -1) + + resulting_atoms = list(/mob/living/simple_animal/hostile/jungle/leaper = 1) + +/datum/micro_organism/cell_line/mega_arachnid + desc = "pseudoarachnoid cells" + required_reagents = list( + /datum/reagent/consumable/nutriment/protein, + /datum/reagent/ants, + /datum/reagent/medicine/omnizine) + + supplementary_reagents = list( + /datum/reagent/toxin/venom = 6, + /datum/reagent/drug/kronkaine = 4, + /datum/reagent/consumable/nutriment/peptides = 3, + /datum/reagent/consumable/ethanol/squirt_cider = 2, + /datum/reagent/consumable/nutraslop = 2, + /datum/reagent/consumable/nutriment/vitamin = 1, + /datum/reagent/toxin/plasma = 1, + /datum/reagent/consumable/nutriment/organ_tissue = 1, + /datum/reagent/liquidgibs = 1, + /datum/reagent/consumable/enzyme = 1) + + suppressive_reagents = list( + /datum/reagent/consumable/ethanol/bug_spray = -3, + /datum/reagent/drug/nicotine = -1, + /datum/reagent/toxin/pestkiller = -1) + + resulting_atoms = list(/mob/living/simple_animal/hostile/jungle/mega_arachnid = 1) + #undef VAT_GROWTH_RATE diff --git a/icons/obj/flora/plants.dmi b/icons/obj/flora/plants.dmi index 0c94332fd1a..6ea1f9a2299 100644 Binary files a/icons/obj/flora/plants.dmi and b/icons/obj/flora/plants.dmi differ