diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index d9aac9fdded..810041ef7a1 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -651,3 +651,12 @@ hitsound = 'sound/effects/snap.ogg' force = 14//quite large fishey throwforce = 6 + +//Holder for snakes +/obj/item/holder/snake + name = "snake" + icon = 'icons/mob/npc/animal.dmi' + icon_state = "snake_rest" + item_state = "snake" + w_class = WEIGHT_CLASS_NORMAL + slot_flags = SLOT_EARS diff --git a/code/modules/mob/living/simple_animal/friendly/snake.dm b/code/modules/mob/living/simple_animal/friendly/snake.dm index ce2129abdc0..149e0334b33 100644 --- a/code/modules/mob/living/simple_animal/friendly/snake.dm +++ b/code/modules/mob/living/simple_animal/friendly/snake.dm @@ -13,6 +13,8 @@ response_help = "pets" response_disarm = "boops" response_harm = "stomps on" - mob_size = MOB_SMALL + mob_size = 3.5 + can_nap = TRUE canbrush = TRUE brush = /obj/item/reagent_containers/glass/rag + holder_type = /obj/item/holder/snake diff --git a/html/changelogs/ASmallCuteCat-equipsnakes.yml b/html/changelogs/ASmallCuteCat-equipsnakes.yml new file mode 100644 index 00000000000..bbd6ad70375 --- /dev/null +++ b/html/changelogs/ASmallCuteCat-equipsnakes.yml @@ -0,0 +1,59 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: ASmallCuteCat + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "You can now pick up snakes and let them sit on your shoulders. They can occupy the LEFT EAR or RIGHT EAR slots." + - imageadd: "Added sprites for held and equipped snakes." diff --git a/icons/mob/npc/animal.dmi b/icons/mob/npc/animal.dmi index f14955aa48d..b38b00a3072 100644 Binary files a/icons/mob/npc/animal.dmi and b/icons/mob/npc/animal.dmi differ