diff --git a/code/game/objects/effects/spawners/random/trash.dm b/code/game/objects/effects/spawners/random/trash.dm index c3bd7804072..8f20a541266 100644 --- a/code/game/objects/effects/spawners/random/trash.dm +++ b/code/game/objects/effects/spawners/random/trash.dm @@ -144,6 +144,7 @@ /obj/item/reagent_containers/cup/bucket = 2, /obj/effect/decal/cleanable/blood/old = 2, /obj/structure/mopbucket = 2, + /mob/living/simple_animal/axolotl = 1, ) /obj/effect/spawner/random/trash/graffiti diff --git a/code/modules/mob/living/simple_animal/friendly/axolotl.dm b/code/modules/mob/living/simple_animal/friendly/axolotl.dm new file mode 100644 index 00000000000..5c07d2e4bd6 --- /dev/null +++ b/code/modules/mob/living/simple_animal/friendly/axolotl.dm @@ -0,0 +1,30 @@ +/mob/living/simple_animal/axolotl + name = "axolotl" + desc = "Quite the colorful amphibian!" + icon_state = "axolotl" + icon_living = "axolotl" + icon_dead = "axolotl_dead" + maxHealth = 10 + health = 10 + attack_verb_continuous = "nibbles" //their teeth are just for gripping food, not used for self defense nor even chewing + attack_verb_simple = "nibble" + butcher_results = list(/obj/item/food/nugget = 1) + response_help_continuous = "pets" + response_help_simple = "pet" + response_disarm_continuous = "gently pushes aside" + response_disarm_simple = "gently push aside" + response_harm_continuous = "splats" + response_harm_simple = "splat" + density = FALSE + pass_flags = PASSTABLE | PASSGRILLE | PASSMOB + mob_size = MOB_SIZE_TINY + mob_biotypes = MOB_ORGANIC|MOB_BEAST + gold_core_spawnable = FRIENDLY_SPAWN + can_be_held = TRUE + held_w_class = WEIGHT_CLASS_TINY + worn_slot_flags = ITEM_SLOT_HEAD + head_icon = 'icons/mob/clothing/head/animal_item_head.dmi' + +/mob/living/simple_animal/axolotl/Initialize(mapload) + . = ..() + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) diff --git a/icons/mob/clothing/head/animal_item_head.dmi b/icons/mob/clothing/head/animal_item_head.dmi index 6afabf22f76..0f6bee3a7ca 100644 Binary files a/icons/mob/clothing/head/animal_item_head.dmi and b/icons/mob/clothing/head/animal_item_head.dmi differ diff --git a/icons/mob/simple/animal.dmi b/icons/mob/simple/animal.dmi index bd64abc0c50..2ef3173b6cb 100644 Binary files a/icons/mob/simple/animal.dmi and b/icons/mob/simple/animal.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 883d2e8c983..d6ba1107c93 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3698,6 +3698,7 @@ #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\axolotl.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"