diff --git a/aurorastation.dme b/aurorastation.dme index 14c60c5a817..bc49b5b2d40 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -2867,6 +2867,7 @@ #include "code\modules\mob\living\simple_animal\friendly\ratking.dm" #include "code\modules\mob\living\simple_animal\friendly\schlorrgo.dm" #include "code\modules\mob\living\simple_animal\friendly\slime.dm" +#include "code\modules\mob\living\simple_animal\friendly\snake.dm" #include "code\modules\mob\living\simple_animal\friendly\spiderbot.dm" #include "code\modules\mob\living\simple_animal\friendly\tomato.dm" #include "code\modules\mob\living\simple_animal\hostile\adhomai.dm" diff --git a/code/game/gamemodes/technomancer/spells/summon/summon_creature.dm b/code/game/gamemodes/technomancer/spells/summon/summon_creature.dm index 802755ed561..3ab3172e0e1 100644 --- a/code/game/gamemodes/technomancer/spells/summon/summon_creature.dm +++ b/code/game/gamemodes/technomancer/spells/summon/summon_creature.dm @@ -2,7 +2,7 @@ name = "Summon Creature" desc = "Teleports a specific creature from their current location in the universe to the targeted tile, \ after a delay. The creature summoned can be chosen by using the ability in your hand. \ - Available creatures are; mice, crabs, parrots, bats, goats, cats, corgis, spiders, and space carp. \ + Available creatures are; mice, crabs, parrots, bats, goats, cats, corgis, snakes, spiders, and space carp. \ The creatures take a few moments to be teleported to the targeted tile. Note that the creatures summoned are \ not inherently loyal to the technomancer, and that the creatures will be hurt slightly from being teleported to you." enhancement_desc = "Summoned entities will never harm their summoner." @@ -27,6 +27,7 @@ "Cat" = /mob/living/simple_animal/cat, "Corgi" = /mob/living/simple_animal/corgi, "Corgi Pup" = /mob/living/simple_animal/corgi/puppy, + "Snake" = /mob/living/simple_animal/snake, "BAT" = /mob/living/simple_animal/hostile/scarybat, "GREIMORIAN" = /mob/living/simple_animal/hostile/giant_spider, "GREIMORIAN HUNTER" = /mob/living/simple_animal/hostile/giant_spider/hunter, diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index e4f3bbc4bbd..a466a4f9a7c 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -249,6 +249,7 @@ /obj/structure/largecrate/animal/corgi = 3, /obj/structure/largecrate/animal/cow = 4, /obj/structure/largecrate/animal/goat = 3, + /obj/structure/largecrate/animal/snake = 3, /obj/structure/largecrate/animal/cat = 2, /obj/structure/largecrate/animal/chick = 4, /obj/structure/largecrate/animal/adhomai = 0.5, diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index 7c4a2c4b0d0..d2fde5041bc 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -63,6 +63,10 @@ name = "cat carrier" held_type = /mob/living/simple_animal/cat +/obj/structure/largecrate/animal/snake + name = "snake crate" + held_type = /mob/living/simple_animal/snake + /obj/structure/largecrate/animal/cat/bones held_type = /mob/living/simple_animal/cat/fluff/bones diff --git a/code/modules/mob/living/simple_animal/friendly/snake.dm b/code/modules/mob/living/simple_animal/friendly/snake.dm new file mode 100644 index 00000000000..ce2129abdc0 --- /dev/null +++ b/code/modules/mob/living/simple_animal/friendly/snake.dm @@ -0,0 +1,18 @@ +/mob/living/simple_animal/snake + name = "snake" + desc = "A slithering serpent." + icon_state = "snake" + icon_living = "snake" + icon_dead = "snake_dead" + icon_rest = "snake_rest" + speak_emote = list("hisses") + emote_see = list("flicks out its tongue", "looks around") + health = 15 + maxHealth = 15 + organ_names = list("head", "body") + response_help = "pets" + response_disarm = "boops" + response_harm = "stomps on" + mob_size = MOB_SMALL + canbrush = TRUE + brush = /obj/item/reagent_containers/glass/rag diff --git a/html/changelogs/ASmallCuteCat - snakes.yml b/html/changelogs/ASmallCuteCat - snakes.yml new file mode 100644 index 00000000000..7b80ae3c459 --- /dev/null +++ b/html/changelogs/ASmallCuteCat - snakes.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: "Adds snakes to the game" + - imageadd: "Ports the snake sprites over from Baystation." diff --git a/icons/mob/npc/animal.dmi b/icons/mob/npc/animal.dmi index 7bb0fdc1d6a..f14955aa48d 100644 Binary files a/icons/mob/npc/animal.dmi and b/icons/mob/npc/animal.dmi differ