diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/dangerous_research.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/dangerous_research.dmm index dca109cfc78..39208f4e9d4 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/dangerous_research.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/dangerous_research.dmm @@ -563,7 +563,7 @@ /area/ruin/space/has_grav) "jH" = ( /obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/friendly/kiwi, +/mob/living/basic/kiwi, /turf/open/floor/iron, /area/ruin/space/has_grav) "jT" = ( diff --git a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/kiwi.dm b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/kiwi.dm deleted file mode 100644 index 409a54fbea9..00000000000 --- a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/kiwi.dm +++ /dev/null @@ -1,31 +0,0 @@ -/mob/living/simple_animal/friendly/kiwi - name = "kiwi" - desc = "It's a kiwi!" - icon = 'modular_skyrat/master_files/icons/mob/newmobs.dmi' - icon_state = "kiwi" - icon_living = "kiwi" - icon_dead = "kiwi_dead" - maxHealth = 15 - health = 15 - response_help_continuous = "pets" - response_help_simple = "pet" - response_disarm_continuous = "moves aside" - response_help_simple = "move aside" - response_harm_continuous = "smacks" - response_harm_simple = "smack" - speak_emote = list("cheeps") - friendly_verb_continuous = "cheeps" - friendly_verb_simple = "cheep" - density = FALSE - mobility_flags = MOBILITY_FLAGS_REST_CAPABLE_DEFAULT - pass_flags = PASSTABLE | PASSGRILLE | PASSMOB - mob_size = MOB_SIZE_LARGE - mob_biotypes = MOB_ORGANIC|MOB_BEAST - gold_core_spawnable = FRIENDLY_SPAWN - verb_say = "cheep" - verb_ask = "cheeps inquisitively" - verb_exclaim = "cheeps loudly" - verb_yell = "screeches" - emote_see = list("cheeps.", "makes a loud cheep.", "runs around.", "cheeps happily.") - speak_chance = 1 - diff --git a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/bananaspider.dm b/modular_skyrat/modules/basic_mobs/code/bananaspider.dm similarity index 73% rename from modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/bananaspider.dm rename to modular_skyrat/modules/basic_mobs/code/bananaspider.dm index eca6fcf650f..b983617e46d 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/bananaspider.dm +++ b/modular_skyrat/modules/basic_mobs/code/bananaspider.dm @@ -1,6 +1,6 @@ // Ported from Citadel Station -/mob/living/simple_animal/banana_spider +/mob/living/basic/banana_spider name = "banana spider" desc = "What the fuck is this abomination?" icon = 'modular_skyrat/master_files/icons/mob/newmobs.dmi' @@ -8,28 +8,30 @@ icon_dead = "bananaspider_peel" health = 1 maxHealth = 1 - turns_per_move = 5 // this isn't player speed =| - speed = 2 // this is player speed - loot = list(/obj/item/food/deadbanana_spider) - atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) - minbodytemp = 270 - maxbodytemp = INFINITY + speed = 2 pass_flags = PASSTABLE | PASSGRILLE | PASSMOB + mob_biotypes = MOB_ORGANIC|MOB_BUG mob_size = MOB_SIZE_TINY - speak_emote = list("chitters") - mouse_opacity = 2 density = TRUE verb_say = "chitters" verb_ask = "chitters inquisitively" verb_exclaim = "chitters loudly" verb_yell = "chitters loudly" - var/squish_chance = 50 - var/projectile_density = TRUE // griffons get shot - del_on_death = TRUE + basic_mob_flags = DEL_ON_DEATH + ai_controller = /datum/ai_controller/basic_controller/cockroach/banana_spider -/mob/living/simple_animal/banana_spider/Initialize(mapload) +/mob/living/basic/banana_spider/Initialize(mapload) . = ..() AddComponent(/datum/component/slippery, 40) + AddElement(/datum/element/death_drops, list(/obj/item/food/deadbanana_spider)) + AddElement(/datum/element/basic_body_temp_sensitive, 270, INFINITY) + AddComponent(/datum/component/squashable, squash_chance = 50, squash_damage = 1) + +/datum/ai_controller/basic_controller/cockroach/banana_spider + idle_behavior = /datum/idle_behavior/idle_random_walk/banana_spider + +/datum/idle_behavior/idle_random_walk/banana_spider + walk_chance = 10 /obj/item/food/deadbanana_spider name = "dead banana spider" diff --git a/modular_skyrat/modules/basic_mobs/code/kiwi.dm b/modular_skyrat/modules/basic_mobs/code/kiwi.dm new file mode 100644 index 00000000000..e7921514117 --- /dev/null +++ b/modular_skyrat/modules/basic_mobs/code/kiwi.dm @@ -0,0 +1,51 @@ +/mob/living/basic/kiwi + name = "kiwi" + desc = "It's a kiwi!" + icon = 'modular_skyrat/master_files/icons/mob/newmobs.dmi' + icon_state = "kiwi" + icon_living = "kiwi" + icon_dead = "kiwi_dead" + maxHealth = 15 + health = 15 + density = FALSE + mobility_flags = MOBILITY_FLAGS_REST_CAPABLE_DEFAULT + pass_flags = PASSTABLE | PASSGRILLE | PASSMOB + mob_size = MOB_SIZE_LARGE + mob_biotypes = MOB_ORGANIC|MOB_BEAST + gold_core_spawnable = FRIENDLY_SPAWN + + response_help_continuous = "pets" + response_help_simple = "pet" + response_disarm_continuous = "moves aside" + response_disarm_simple = "move aside" + response_harm_continuous = "smacks" + response_harm_simple = "smack" + friendly_verb_continuous = "boops" + friendly_verb_simple = "boop" + verb_say = "cheep" + verb_ask = "cheeps inquisitively" + verb_exclaim = "cheeps loudly" + verb_yell = "screeches" + + ai_controller = /datum/ai_controller/basic_controller/kiwi + +/mob/living/basic/kiwi/Initialize(mapload) + . = ..() + AddElement(/datum/element/pet_bonus, "cheeps happily!") + +/datum/ai_controller/basic_controller/kiwi + blackboard = list() + + ai_traits = STOP_MOVING_WHEN_PULLED + ai_movement = /datum/ai_movement/basic_avoidance + idle_behavior = /datum/idle_behavior/idle_random_walk + + planning_subtrees = list( + /datum/ai_planning_subtree/random_speech/kiwi, + ) + +/datum/ai_planning_subtree/random_speech/kiwi + speech_chance = 5 + emote_hear = list("makes a loud cheep.", "cheeps happily.") + emote_see = list("runs around.") + speak = list("cheep", "cheep cheep!") diff --git a/modular_skyrat/modules/customization/modules/hydroponics/grown/bananaspider.dm b/modular_skyrat/modules/customization/modules/hydroponics/grown/bananaspider.dm index 154f370d2b0..39655703d56 100644 --- a/modular_skyrat/modules/customization/modules/hydroponics/grown/bananaspider.dm +++ b/modular_skyrat/modules/customization/modules/hydroponics/grown/bananaspider.dm @@ -29,7 +29,7 @@ /obj/item/food/grown/banana/banana_spider_spawnable/proc/spawnspider() if(!QDELETED(src)) - var/mob/living/simple_animal/banana_spider/banana_spider = new /mob/living/simple_animal/banana_spider(get_turf(loc)) + var/mob/living/basic/banana_spider/banana_spider = new(get_turf(loc)) banana_spider.visible_message(span_notice("The banana spider chitters as it stretches its legs")) qdel(src) diff --git a/tgstation.dme b/tgstation.dme index 7fc284dc69d..02f9fc4b1ee 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5026,10 +5026,8 @@ #include "modular_skyrat\master_files\code\modules\mob\living\human\species.dm" #include "modular_skyrat\master_files\code\modules\mob\living\sillicon\robot.dm" #include "modular_skyrat\master_files\code\modules\mob\living\simple_animal\simple_animal.dm" -#include "modular_skyrat\master_files\code\modules\mob\living\simple_animal\friendly\bananaspider.dm" #include "modular_skyrat\master_files\code\modules\mob\living\simple_animal\friendly\bumbles.dm" #include "modular_skyrat\master_files\code\modules\mob\living\simple_animal\friendly\dogs.dm" -#include "modular_skyrat\master_files\code\modules\mob\living\simple_animal\friendly\kiwi.dm" #include "modular_skyrat\master_files\code\modules\mob\living\simple_animal\friendly\poppy.dm" #include "modular_skyrat\master_files\code\modules\mob\living\simple_animal\hostile\bubblegum.dm" #include "modular_skyrat\master_files\code\modules\mob\living\simple_animal\hostile\grabbagmob.dm" @@ -5225,6 +5223,8 @@ #include "modular_skyrat\modules\banning\code\skyrat_bans.dm" #include "modular_skyrat\modules\barricades\code\barricade.dm" #include "modular_skyrat\modules\barsigns\code\barsigns.dm" +#include "modular_skyrat\modules\basic_mobs\code\bananaspider.dm" +#include "modular_skyrat\modules\basic_mobs\code\kiwi.dm" #include "modular_skyrat\modules\better_vox\code\vox_bodycolor.dm" #include "modular_skyrat\modules\better_vox\code\vox_bodyparts.dm" #include "modular_skyrat\modules\better_vox\code\vox_clothing.dm"