cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 05:30:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Converts butterflies to basic mobs and adds them to cytology (#75582)

Browse Source 
## About The Pull Request

Converts butterflies into basic mobs.
Also a little list organisation.

<details>
<summary>Yep, those are some butterflies alright</summary>


![image](https://github.com/Skyrat-SS13/Skyrat-tg/assets/8881105/d9e3a14e-e0a5-4275-b440-af0a56e7b8fe)

</details>

## Changelog
🆑
refactor: Converted butterflies to the basic mob system
add: Butterflies can now be grown in cytology
/🆑
This commit is contained in:
Tom
2023-05-22 10:30:48 -06:00
committed by GitHub
parent 9f7c3d955a
commit e5ce1c09a7
30 changed files with 139 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/AnywhereRuins/fountain_hall.dmm
+1 -1
View File
@@ -21,7 +21,7 @@
/turf/open/floor/engine/cult,
/area/ruin/unpowered)
"g" = (
/mob/living/simple_animal/butterfly,
/mob/living/basic/butterfly,
/turf/open/floor/engine/cult,
/area/ruin/unpowered)
"h" = (
_maps/RandomRuins/IceRuins/icemoon_surface_bughabitat.dmm
+3 -3
View File
@@ -178,7 +178,7 @@
/turf/open/floor/plastic,
/area/ruin/bughabitat)
"uB" = (
/mob/living/simple_animal/butterfly,
/mob/living/basic/butterfly,
/obj/structure/chair/pew/left{
dir = 8
},
@@ -205,7 +205,7 @@
/turf/open/floor/plastic,
/area/ruin/bughabitat)
"xq" = (
/mob/living/simple_animal/butterfly,
/mob/living/basic/butterfly,
/obj/effect/turf_decal/siding/wideplating/light{
color = "#236F26"
},
@@ -322,7 +322,7 @@
/obj/item/stack/ducts/fifty{
amount = 23
},
/mob/living/simple_animal/butterfly,
/mob/living/basic/butterfly,
/turf/open/floor/plastic,
/area/ruin/bughabitat)
"Nv" = (
_maps/RandomRuins/LavaRuins/lavaland_surface_gaia.dmm
+2 -6
View File
@@ -36,9 +36,7 @@
/turf/open/misc/grass/lavaland,
/area/ruin/unpowered/gaia)
"j" = (
/mob/living/simple_animal/butterfly{
atmos_requirements = list()
},
/mob/living/basic/butterfly/lavaland,
/turf/open/misc/grass/lavaland,
/area/ruin/unpowered/gaia)
"l" = (
@@ -67,9 +65,7 @@
"r" = (
/obj/structure/flora/grass/jungle/b/style_random,
/obj/structure/flora/bush/sparsegrass/style_random,
/mob/living/simple_animal/butterfly{
atmos_requirements = list()
},
/mob/living/basic/butterfly/lavaland,
/turf/open/misc/grass/lavaland,
/area/ruin/unpowered/gaia)
"s" = (
_maps/RandomRuins/SpaceRuins/spinwardsmoothies.dmm
+4 -4
View File
@@ -4,7 +4,7 @@
/turf/open/floor/grass,
/area/ruin/space/has_grav/spinwardsmoothies)
"dq" = (
/mob/living/simple_animal/butterfly,
/mob/living/basic/butterfly,
/turf/open/floor/grass,
/area/ruin/space/has_grav/spinwardsmoothies)
"dD" = (
@@ -30,7 +30,7 @@
/area/ruin/space/has_grav/spinwardsmoothies)
"rf" = (
/obj/structure/flora/bush/flowers_br/style_random,
/mob/living/simple_animal/butterfly,
/mob/living/basic/butterfly,
/turf/open/floor/grass,
/area/ruin/space/has_grav/spinwardsmoothies)
"ri" = (
@@ -55,7 +55,7 @@
/area/ruin/space/has_grav/spinwardsmoothies)
"uX" = (
/obj/structure/flora/bush/flowers_pp/style_random,
/mob/living/simple_animal/butterfly,
/mob/living/basic/butterfly,
/turf/open/floor/grass,
/area/ruin/space/has_grav/spinwardsmoothies)
"xc" = (
@@ -190,7 +190,7 @@
/area/ruin/space/has_grav/spinwardsmoothies)
"UZ" = (
/obj/structure/flora/bush/flowers_yw/style_random,
/mob/living/simple_animal/butterfly,
/mob/living/basic/butterfly,
/turf/open/floor/grass,
/area/ruin/space/has_grav/spinwardsmoothies)
"XG" = (
_maps/RandomRuins/SpaceRuins/vaporwave.dmm
+1 -1
View File
@@ -91,7 +91,7 @@
/turf/open/floor/iron/vaporwave,
/area/ruin/space/has_grav/powered/aesthetic)
"w" = (
/mob/living/simple_animal/butterfly,
/mob/living/basic/butterfly,
/turf/open/floor/iron/vaporwave,
/area/ruin/space/has_grav/powered/aesthetic)
"x" = (
_maps/map_files/NorthStar/north_star.dmm
+4 -4
View File
@@ -10680,7 +10680,7 @@
/turf/open/floor/plating,
/area/station/hallway/floor2/aft)
"cHn" = (
/mob/living/simple_animal/butterfly,
/mob/living/basic/butterfly,
/turf/open/floor/grass,
/area/station/hallway/secondary/entry)
"cHr" = (
@@ -36656,7 +36656,7 @@
/obj/structure/window/reinforced/spawner/directional/south,
/obj/structure/flora/bush/sparsegrass/style_random,
/obj/structure/flora/bush/flowers_yw/style_random,
/mob/living/simple_animal/butterfly,
/mob/living/basic/butterfly,
/turf/open/floor/grass,
/area/station/service/bar/atrium)
"jLE" = (
@@ -62439,7 +62439,7 @@
"qpF" = (
/obj/structure/window/reinforced/spawner/directional/south,
/obj/effect/turf_decal/siding/thinplating_new,
/mob/living/simple_animal/butterfly,
/mob/living/basic/butterfly,
/turf/open/floor/grass,
/area/station/hallway/secondary/entry)
"qqp" = (
@@ -88355,7 +88355,7 @@
/obj/structure/window/reinforced/spawner/directional/south,
/obj/structure/flora/bush/sparsegrass/style_random,
/obj/structure/flora/bush/lavendergrass/style_random,
/mob/living/simple_animal/butterfly,
/mob/living/basic/butterfly,
/turf/open/floor/grass,
/area/station/service/bar/atrium)
"xit" = (
_maps/map_files/tramstation/maintenance_modules/dormmedupper_3.dmm
+2 -2
View File
@@ -330,7 +330,7 @@
/turf/open/floor/grass,
/area/station/asteroid)
"NE" = (
/mob/living/simple_animal/butterfly,
/mob/living/basic/butterfly,
/turf/open/floor/grass,
/area/station/asteroid)
"NX" = (
@@ -355,7 +355,7 @@
/area/station/maintenance/department/crew_quarters/dorms)
"Qt" = (
/obj/structure/flora/bush/sparsegrass/style_random,
/mob/living/simple_animal/butterfly,
/mob/living/basic/butterfly,
/turf/open/floor/grass,
/area/station/asteroid)
"SV" = (
_maps/map_files/tramstation/maintenance_modules/secbarupper_3.dmm
+2 -2
View File
@@ -154,11 +154,11 @@
/area/station/maintenance/department/security)
"sF" = (
/obj/structure/flora/bush/sparsegrass/style_random,
/mob/living/simple_animal/butterfly,
/mob/living/basic/butterfly,
/turf/open/floor/grass,
/area/station/asteroid)
"tc" = (
/mob/living/simple_animal/butterfly,
/mob/living/basic/butterfly,
/turf/open/floor/grass,
/area/station/asteroid)
"tn" = (
_maps/shuttles/emergency_monastery.dmm
+1 -1
View File
@@ -3827,7 +3827,7 @@
/turf/open/floor/mineral/plastitanium/red,
/area/shuttle/escape/brig)
"Zj" = (
/mob/living/simple_animal/butterfly,
/mob/living/basic/butterfly,
/turf/open/floor/grass,
/area/shuttle/escape)
"Zl" = (
_maps/shuttles/emergency_tranquility.dmm
+3 -3
View File
@@ -851,7 +851,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 6
},
/mob/living/simple_animal/butterfly{
/mob/living/basic/butterfly{
name = "Peacekeeper Henry"
},
/turf/open/floor/grass,
@@ -2549,7 +2549,7 @@
/turf/open/floor/wood/tile,
/area/shuttle/escape)
"UJ" = (
/mob/living/simple_animal/butterfly{
/mob/living/basic/butterfly{
name = "Peacekeeper Henry"
},
/turf/open/floor/grass,
@@ -2642,7 +2642,7 @@
/obj/effect/turf_decal/siding/wood/corner{
dir = 1
},
/mob/living/simple_animal/butterfly,
/mob/living/basic/butterfly,
/turf/open/floor/grass,
/area/shuttle/escape)
"WM" = (
code/__DEFINES/research.dm
+1
View File
@@ -54,6 +54,7 @@
#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_BUTTERFLY "cell_line_butterfly_table"
#define CELL_LINE_TABLE_LEAPER "cell_line_leaper_table"
#define CELL_LINE_TABLE_MEGA_ARACHNID "cell_line_table_mega_arachnid"
code/__HELPERS/icons.dm
+1 -1
View File
@@ -1016,7 +1016,7 @@ GLOBAL_LIST_EMPTY(friendly_animal_types)
var/image/final_image = image(icon, icon_state=icon_state, loc = A)
if(ispath(SA, /mob/living/simple_animal/butterfly))
if(ispath(SA, /mob/living/basic/butterfly))
final_image.color = rgb(rand(0,255), rand(0,255), rand(0,255))
// For debugging
code/_globalvars/lists/xenobiology.dm
+3 -1
View File
@@ -72,6 +72,7 @@ GLOBAL_LIST_INIT_TYPED(cell_line_tables, /list, list(
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_BUTTERFLY = list(/datum/micro_organism/cell_line/butterfly = 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(
@@ -79,9 +80,10 @@ GLOBAL_LIST_INIT_TYPED(cell_line_tables, /list, list(
/datum/micro_organism/cell_line/leaper = 2,
/datum/micro_organism/cell_line/mega_arachnid = 1,
/datum/micro_organism/cell_line/queen_bee = 1,
/datum/micro_organism/cell_line/butterfly = 1,
/datum/micro_organism/cell_line/snake = 1,
/datum/micro_organism/cell_line/walking_mushroom = 2,
/datum/micro_organism/cell_line/axolotl = 1
/datum/micro_organism/cell_line/axolotl = 1,
)
))
code/datums/diseases/anxiety.dm
+2 -2
View File
@@ -40,5 +40,5 @@
if(SPT_PROB(1, seconds_per_tick))
affected_mob.visible_message(span_danger("[affected_mob] coughs up butterflies!"), \
span_userdanger("You cough up butterflies!"))
new /mob/living/simple_animal/butterfly(affected_mob.loc)
new /mob/living/simple_animal/butterfly(affected_mob.loc)
new /mob/living/basic/butterfly(affected_mob.loc)
new /mob/living/basic/butterfly(affected_mob.loc)
code/datums/memory/_memory.dm
+1 -1
View File
@@ -245,6 +245,7 @@
var/static/list/something_pool = list(
/mob/living/basic/bat,
/mob/living/basic/butterfly,
/mob/living/basic/carp,
/mob/living/basic/carp/magic,
/mob/living/basic/carp/magic/chaos,
@@ -261,7 +262,6 @@
/mob/living/basic/statue,
/mob/living/basic/stickman,
/mob/living/basic/stickman/dog,
/mob/living/simple_animal/butterfly,
/mob/living/simple_animal/chick,
/mob/living/simple_animal/chicken,
/mob/living/simple_animal/crab,
code/game/objects/items/weaponry.dm
+3 -3
View File
@@ -853,13 +853,13 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
/obj/item/melee/flyswatter/Initialize(mapload)
. = ..()
splattable = typecacheof(list(
/mob/living/simple_animal/hostile/bee,
/mob/living/simple_animal/butterfly,
/mob/living/basic/butterfly,
/mob/living/basic/cockroach,
/obj/item/queen_bee,
/mob/living/basic/spiderling,
/mob/living/simple_animal/hostile/ant,
/mob/living/simple_animal/hostile/bee,
/obj/effect/decal/cleanable/ants,
/obj/item/queen_bee,
))
strong_against = typecacheof(list(
/mob/living/basic/giant_spider,
code/modules/cargo/packs/livestock.dm
+2 -2
View File
@@ -21,13 +21,13 @@
contraband = TRUE
cost = CARGO_CRATE_VALUE * 5
access_view = ACCESS_THEATRE
contains = list(/mob/living/simple_animal/butterfly)
contains = list(/mob/living/basic/butterfly)
crate_name = "entomology samples crate"
/datum/supply_pack/critter/butterfly/generate()
. = ..()
for(var/i in 1 to 49)
new /mob/living/simple_animal/butterfly(.)
new /mob/living/basic/butterfly(.)
/datum/supply_pack/critter/cat
name = "Cat Crate"
code/modules/events/ghost_role/sentience.dm
+11 -11
View File
@@ -1,24 +1,24 @@
GLOBAL_LIST_INIT(high_priority_sentience, typecacheof(list(
/mob/living/basic/bat,
/mob/living/basic/butterfly,
/mob/living/basic/lizard,
/mob/living/basic/carp/pet/cayenne,
/mob/living/basic/cow,
/mob/living/basic/giant_spider/sgt_araneus,
/mob/living/basic/mouse/brown/tom,
/mob/living/basic/pet,
/mob/living/basic/pig,
/mob/living/basic/rabbit,
/mob/living/basic/sheep,
/mob/living/simple_animal/pet,
/mob/living/simple_animal/parrot,
/mob/living/basic/lizard,
/mob/living/simple_animal/sloth,
/mob/living/simple_animal/hostile/retaliate/goat,
/mob/living/simple_animal/chicken,
/mob/living/basic/bat,
/mob/living/simple_animal/butterfly,
/mob/living/simple_animal/hostile/retaliate/snake,
/mob/living/simple_animal/hostile/retaliate/goose/vomit,
/mob/living/simple_animal/bot/mulebot,
/mob/living/simple_animal/bot/secbot/beepsky,
/mob/living/basic/carp/pet/cayenne,
/mob/living/basic/cow,
/mob/living/basic/pet,
/mob/living/basic/pig,
/mob/living/basic/rabbit,
/mob/living/basic/giant_spider/sgt_araneus,
/mob/living/basic/sheep,
/mob/living/basic/mouse/brown/tom,
)))
/datum/round_event_control/sentience
code/modules/events/scrubber_clog.dm
+4 -4
View File
@@ -65,10 +65,10 @@
/datum/round_event/scrubber_clog/proc/get_mob()
var/static/list/mob_list = list(
/mob/living/basic/cockroach,
/mob/living/basic/giant_spider/maintenance,
/mob/living/basic/mouse,
/mob/living/simple_animal/butterfly,
/mob/living/basic/butterfly,
/mob/living/basic/cockroach,
/mob/living/basic/giant_spider/maintenance,
/mob/living/basic/mouse,
)
return pick(mob_list)
code/modules/events/wizard/petsplosion.dm
+11 -11
View File
@@ -1,24 +1,24 @@
/// Candidates for the petsplosion wizard event
GLOBAL_LIST_INIT(petsplosion_candidates, typecacheof(list(
/mob/living/simple_animal/pet,
/mob/living/simple_animal/parrot,
/mob/living/basic/lizard,
/mob/living/simple_animal/sloth,
/mob/living/simple_animal/hostile/retaliate/goat,
/mob/living/simple_animal/chicken,
/mob/living/basic/bat,
/mob/living/simple_animal/butterfly,
/mob/living/simple_animal/hostile/retaliate/snake,
/mob/living/simple_animal/hostile/retaliate/goose/vomit,
/mob/living/basic/butterfly,
/mob/living/basic/carp/pet/cayenne,
/mob/living/basic/cow,
/mob/living/basic/giant_spider/sgt_araneus,
/mob/living/basic/lizard,
/mob/living/basic/mothroach,
/mob/living/basic/mouse/brown/tom,
/mob/living/basic/pet,
/mob/living/basic/pig,
/mob/living/basic/rabbit,
/mob/living/basic/giant_spider/sgt_araneus,
/mob/living/basic/sheep,
/mob/living/basic/mouse/brown/tom,
/mob/living/simple_animal/pet,
/mob/living/simple_animal/parrot,
/mob/living/simple_animal/sloth,
/mob/living/simple_animal/hostile/retaliate/goat,
/mob/living/simple_animal/chicken,
/mob/living/simple_animal/hostile/retaliate/snake,
/mob/living/simple_animal/hostile/retaliate/goose/vomit,
)))
/datum/round_event_control/wizard/petsplosion //the horror
code/modules/holodeck/holo_effect.dm
+2 -2
View File
@@ -82,10 +82,10 @@
/obj/effect/holodeck_effect/mobspawner/pet/Initialize(mapload)
. = ..()
mobtype = list(
/mob/living/simple_animal/butterfly,
/mob/living/basic/butterfly,
/mob/living/basic/rabbit,
/mob/living/simple_animal/chick/holo,
/mob/living/simple_animal/pet/fox,
/mob/living/basic/rabbit,
)
mobtype += pick(
/mob/living/basic/pet/dog/corgi,
code/modules/mob/living/simple_animal/friendly/butterfly.dm → code/modules/mob/living/basic/vermin/butterfly.dm
+20 -12
View File
@@ -1,10 +1,10 @@
/mob/living/simple_animal/butterfly
/mob/living/basic/butterfly
name = "butterfly"
desc = "A colorful butterfly, how'd it get up here?"
icon_state = "butterfly"
icon_living = "butterfly"
icon_dead = "butterfly_dead"
turns_per_move = 1
response_help_continuous = "shoos"
response_help_simple = "shoo"
response_disarm_continuous = "brushes aside"
@@ -12,27 +12,35 @@
response_harm_continuous = "squashes"
response_harm_simple = "squash"
speak_emote = list("flutters")
maxHealth = 2
health = 2
harm_intent_damage = 1
friendly_verb_continuous = "nudges"
friendly_verb_simple = "nudge"
maxHealth = 2
health = 2
density = FALSE
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
mob_size = MOB_SIZE_TINY
mob_biotypes = MOB_ORGANIC|MOB_BUG
mob_biotypes = MOB_ORGANIC | MOB_BUG
gold_core_spawnable = FRIENDLY_SPAWN
verb_say = "flutters"
verb_ask = "flutters inquisitively"
verb_exclaim = "flutters intensely"
verb_yell = "flutters intensely"
/mob/living/simple_animal/butterfly/Initialize(mapload)
ai_controller = /datum/ai_controller/basic_controller/butterfly
/mob/living/basic/butterfly/Initialize(mapload)
. = ..()
AddElement(/datum/element/simple_flying)
var/newcolor = rgb(rand(0, 255), rand(0, 255), rand(0, 255))
add_atom_colour(newcolor, FIXED_COLOUR_PRIORITY)
ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
AddElement(/datum/element/swabable, CELL_LINE_TABLE_BUTTERFLY, CELL_VIRUS_TABLE_GENERIC_MOB, cell_line_amount = 1, virus_chance = 5)
/mob/living/simple_animal/butterfly/bee_friendly()
/mob/living/basic/butterfly/bee_friendly()
return TRUE //treaty signed at the Beeneeva convention
/datum/ai_controller/basic_controller/butterfly
ai_movement = /datum/ai_movement/basic_avoidance
idle_behavior = /datum/idle_behavior/idle_random_walk
/mob/living/basic/butterfly/lavaland
unsuitable_atmos_damage = 0
code/modules/mob/living/basic/vermin/lizard.dm
+1 -1
View File
@@ -37,8 +37,8 @@
/// Typecache of things that we seek out to eat. Yummy.
var/static/list/edibles = typecacheof(list(
/mob/living/basic/butterfly,
/mob/living/basic/cockroach,
/mob/living/simple_animal/butterfly,
))
/mob/living/basic/lizard/Initialize(mapload)
code/modules/mob/living/living.dm
+22 -22
View File
@@ -1375,40 +1375,40 @@
if(WABBAJACK_ANIMAL)
var/picked_animal = pick(
/mob/living/basic/carp,
/mob/living/simple_animal/hostile/bear,
/mob/living/simple_animal/hostile/mushroom,
/mob/living/basic/statue,
/mob/living/basic/bat,
/mob/living/simple_animal/hostile/retaliate/goat,
/mob/living/basic/killer_tomato,
/mob/living/basic/giant_spider,
/mob/living/basic/giant_spider/hunter,
/mob/living/simple_animal/hostile/blob/blobbernaut/independent,
/mob/living/basic/butterfly,
/mob/living/basic/carp,
/mob/living/basic/carp/magic,
/mob/living/basic/carp/magic/chaos,
/mob/living/basic/cow,
/mob/living/basic/giant_spider,
/mob/living/basic/giant_spider/hunter,
/mob/living/basic/killer_tomato,
/mob/living/basic/lizard,
/mob/living/basic/mouse,
/mob/living/basic/pet/dog/breaddog,
/mob/living/basic/pet/dog/corgi,
/mob/living/basic/pet/dog/pug,
/mob/living/basic/statue,
/mob/living/basic/stickman,
/mob/living/basic/stickman/dog,
/mob/living/simple_animal/crab,
/mob/living/simple_animal/chick,
/mob/living/simple_animal/chicken,
/mob/living/simple_animal/hostile/bear,
/mob/living/simple_animal/hostile/mushroom,
/mob/living/simple_animal/hostile/retaliate/goat,
/mob/living/simple_animal/hostile/blob/blobbernaut/independent,
/mob/living/simple_animal/hostile/asteroid/basilisk/watcher,
/mob/living/simple_animal/hostile/asteroid/goliath/beast,
/mob/living/simple_animal/hostile/headcrab,
/mob/living/simple_animal/hostile/morph,
/mob/living/basic/stickman,
/mob/living/basic/stickman/dog,
/mob/living/simple_animal/hostile/megafauna/dragon/lesser,
/mob/living/simple_animal/hostile/gorilla,
/mob/living/simple_animal/parrot,
/mob/living/basic/pet/dog/corgi,
/mob/living/simple_animal/crab,
/mob/living/basic/pet/dog/pug,
/mob/living/simple_animal/pet/cat,
/mob/living/basic/mouse,
/mob/living/simple_animal/chicken,
/mob/living/basic/cow,
/mob/living/basic/lizard,
/mob/living/simple_animal/pet/fox,
/mob/living/simple_animal/butterfly,
/mob/living/simple_animal/pet/cat/cak,
/mob/living/basic/pet/dog/breaddog,
/mob/living/simple_animal/chick,
/mob/living/simple_animal/pet/fox,
)
new_mob = new picked_animal(loc)
code/modules/reagents/chemistry/recipes/others.dm
+1 -1
View File
@@ -605,7 +605,7 @@
/datum/chemical_reaction/butterflium/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i in rand(1, created_volume) to created_volume)
new /mob/living/simple_animal/butterfly(location)
new /mob/living/basic/butterfly(location)
..()
//scream powder
/datum/chemical_reaction/scream
code/modules/research/experimentor.dm
+7 -7
View File
@@ -639,18 +639,18 @@
to_chat(user, message)
var/static/list/valid_animals = list(
/mob/living/simple_animal/parrot/natural,
/mob/living/simple_animal/butterfly,
/mob/living/simple_animal/pet/cat,
/mob/living/basic/butterfly,
/mob/living/basic/carp,
/mob/living/basic/lizard,
/mob/living/basic/mouse,
/mob/living/basic/pet/dog/corgi,
/mob/living/basic/pet/dog/pug,
/mob/living/simple_animal/crab,
/mob/living/simple_animal/pet/fox,
/mob/living/basic/lizard,
/mob/living/basic/mouse,
/mob/living/simple_animal/hostile/bear,
/mob/living/simple_animal/hostile/bee,
/mob/living/basic/carp,
/mob/living/simple_animal/parrot/natural,
/mob/living/simple_animal/pet/cat,
/mob/living/simple_animal/pet/fox,
)
for(var/counter in 1 to rand(1, 25))
var/mobType = pick(valid_animals)
code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm
+22
View File
@@ -664,6 +664,28 @@
return
QDEL_NULL(vat.biological_sample)
/datum/micro_organism/cell_line/butterfly
desc = "Papilionoidea cells"
required_reagents = list(
/datum/reagent/consumable/nutriment/protein,
)
supplementary_reagents = list(
/datum/reagent/consumable/honey = 4,
/datum/reagent/consumable/korta_nectar = 3,
/datum/reagent/consumable/applejuice = 2,
/datum/reagent/water = 1,
/datum/reagent/consumable/sugar = 1,
)
suppressive_reagents = list(
/datum/reagent/toxin/pestkiller = -3,
/datum/reagent/toxin/carpotoxin = -2,
/datum/reagent/toxin = -2,
)
virus_suspectibility = 0
resulting_atoms = list(/mob/living/basic/butterfly = 3)
/datum/micro_organism/cell_line/leaper
desc = "atypical amphibian cells"
required_reagents = list(
code/modules/unit_tests/simple_animal_freeze.dm
-1
View File
@@ -32,7 +32,6 @@
/mob/living/simple_animal/bot/secbot/honkbot,
/mob/living/simple_animal/bot/secbot/pingsky,
/mob/living/simple_animal/bot/vibebot,
/mob/living/simple_animal/butterfly,
/mob/living/simple_animal/chick,
/mob/living/simple_animal/chick/holo,
/mob/living/simple_animal/chicken,
tgstation.dme
+1 -1
View File
@@ -3989,6 +3989,7 @@
#include "code\modules\mob\living\basic\syndicate\syndicate.dm"
#include "code\modules\mob\living\basic\syndicate\syndicate_ai.dm"
#include "code\modules\mob\living\basic\vermin\axolotl.dm"
#include "code\modules\mob\living\basic\vermin\butterfly.dm"
#include "code\modules\mob\living\basic\vermin\cockroach.dm"
#include "code\modules\mob\living\basic\vermin\frog.dm"
#include "code\modules\mob\living\basic\vermin\lizard.dm"
@@ -4156,7 +4157,6 @@
#include "code\modules\mob\living\simple_animal\bot\secbot.dm"
#include "code\modules\mob\living\simple_animal\bot\SuperBeepsky.dm"
#include "code\modules\mob\living\simple_animal\bot\vibebot.dm"
#include "code\modules\mob\living\simple_animal\friendly\butterfly.dm"
#include "code\modules\mob\living\simple_animal\friendly\cat.dm"
#include "code\modules\mob\living\simple_animal\friendly\crab.dm"
#include "code\modules\mob\living\simple_animal\friendly\farm_animals.dm"
tools/UpdatePaths/Scripts/75582_simple_to_basic_butterflies.txt
+1
View File
@@ -0,0 +1 @@
/mob/living/simple_animal/butterfly : /mob/living/basic/butterfly{@OLD}