cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +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
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)