diff --git a/baystation12.dme b/baystation12.dme index 9871920c126..b3426554156 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -1334,6 +1334,7 @@ #include "code\modules\mob\living\simple_animal\friendly\corgi.dm" #include "code\modules\mob\living\simple_animal\friendly\crab.dm" #include "code\modules\mob\living\simple_animal\friendly\farm_animals.dm" +#include "code\modules\mob\living\simple_animal\friendly\fox.dm" #include "code\modules\mob\living\simple_animal\friendly\lizard.dm" #include "code\modules\mob\living\simple_animal\friendly\mouse.dm" #include "code\modules\mob\living\simple_animal\friendly\mushroom.dm" diff --git a/code/modules/mob/living/simple_animal/friendly/fox.dm b/code/modules/mob/living/simple_animal/friendly/fox.dm new file mode 100644 index 00000000000..f29b3eb869f --- /dev/null +++ b/code/modules/mob/living/simple_animal/friendly/fox.dm @@ -0,0 +1,25 @@ +//Foxxy +/mob/living/simple_animal/corgi/fox + name = "fox" + desc = "It's a fox. I wonder what it says?" + icon_state = "fox" + icon_living = "fox" + icon_dead = "fox_dead" + speak = list("Ack-Ack","Ack-Ack-Ack-Ackawoooo","Geckers","Awoo","Tchoff") + speak_emote = list("geckers", "barks") + emote_hear = list("howls","barks") + emote_see = list("shakes its head", "shivers") + speak_chance = 1 + turns_per_move = 5 + see_in_dark = 6 + meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_amount = 3 + response_help = "pets" + response_disarm = "gently pushes aside" + response_harm = "kicks" + mob_size = 8 +//Captain fox +/mob/living/simple_animal/corgi/fox/Chauncey + name = "Chauncey" + desc = "Chauncey, the Captain's trustworthy fox. I wonder what it says?" + diff --git a/html/changelogs/Fire and Glory-FaG Branch 4.yml b/html/changelogs/Fire and Glory-FaG Branch 4.yml new file mode 100644 index 00000000000..2e1bea80b5c --- /dev/null +++ b/html/changelogs/Fire and Glory-FaG Branch 4.yml @@ -0,0 +1,36 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Fire and Glory + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Porting foxes and Chauncey from oldcode, not in any maps, currently." diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi index d968c6ed577..deb19988ce6 100644 Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ