diff --git a/code/__DEFINES/research.dm b/code/__DEFINES/research.dm index 0c16f8732f2..75360c8488e 100644 --- a/code/__DEFINES/research.dm +++ b/code/__DEFINES/research.dm @@ -51,6 +51,7 @@ #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_AXOLOTL "cell_line_axolotl_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" diff --git a/code/_globalvars/lists/xenobiology.dm b/code/_globalvars/lists/xenobiology.dm index ee2a7724b21..2b861ff465b 100644 --- a/code/_globalvars/lists/xenobiology.dm +++ b/code/_globalvars/lists/xenobiology.dm @@ -69,6 +69,7 @@ GLOBAL_LIST_INIT_TYPED(cell_line_tables, /list, list( 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_AXOLOTL = list(/datum/micro_organism/cell_line/axolotl = 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), @@ -80,6 +81,7 @@ GLOBAL_LIST_INIT_TYPED(cell_line_tables, /list, list( /datum/micro_organism/cell_line/queen_bee = 1, /datum/micro_organism/cell_line/snake = 1, /datum/micro_organism/cell_line/walking_mushroom = 2, + /datum/micro_organism/cell_line/axolotl = 1 ) )) diff --git a/code/modules/mob/living/basic/vermin/axolotl.dm b/code/modules/mob/living/basic/vermin/axolotl.dm index a56f1df5909..3b1f630df40 100644 --- a/code/modules/mob/living/basic/vermin/axolotl.dm +++ b/code/modules/mob/living/basic/vermin/axolotl.dm @@ -34,6 +34,7 @@ /mob/living/basic/axolotl/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) + AddElement(/datum/element/swabable, CELL_LINE_TABLE_AXOLOTL, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5) /datum/ai_controller/basic_controller/axolotl ai_traits = STOP_MOVING_WHEN_PULLED 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 f4eecc7104b..42e04f56ecf 100644 --- a/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm +++ b/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm @@ -563,7 +563,7 @@ resulting_atoms = list(/mob/living/simple_animal/hostile/retaliate/clown/longface = 1) /datum/micro_organism/cell_line/frog - desc = "amphibian cells" + desc = "anura amphibian cells" required_reagents = list(/datum/reagent/consumable/nutriment/protein) supplementary_reagents = list( @@ -583,6 +583,29 @@ virus_suspectibility = 0.5 resulting_atoms = list(/mob/living/basic/frog = 1) +/datum/micro_organism/cell_line/axolotl + desc = "caudata amphibian cells" + required_reagents = list(/datum/reagent/consumable/nutriment/protein) + + supplementary_reagents = list( + /datum/reagent/ants = 3, + /datum/reagent/liquidgibs = 2, + /datum/reagent/consumable/salt = 1, + /datum/reagent/consumable/eggwhite= 1, + /datum/reagent/consumable/nutriment/vitamin = 1,) + + suppressive_reagents = list( + /datum/reagent/ammonia = -3, + /datum/reagent/toxin/bungotoxin = -3, + /datum/reagent/toxin/spore = -3, + /datum/reagent/toxin/plantbgone = -2, //GAY AXOLOTLS + /datum/reagent/drying_agent = -4, + /datum/reagent/consumable/mold = -2, + /datum/reagent/toxin = -1) + + virus_suspectibility = 0.5 + resulting_atoms = list(/mob/living/basic/axolotl = 1) + /datum/micro_organism/cell_line/walking_mushroom desc = "motile fungal hyphae" required_reagents = list(/datum/reagent/consumable/nutriment/protein)