diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index a6ac27a884a..ce963f79c79 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -81,6 +81,10 @@ /obj/structure/largecrate/animal/dog/pug held_type = /mob/living/simple_animal/hostile/commanded/dog/pug +/obj/structure/largecrate/animal/dog/bullterrier + name = "bull terrier carrier" + held_type = /mob/living/simple_animal/hostile/commanded/dog/bullterrier + /obj/structure/largecrate/animal/adhomai name = "adhomian animal crate" held_type = /mob/living/simple_animal/ice_tunneler diff --git a/code/modules/cargo/random_stock/large.dm b/code/modules/cargo/random_stock/large.dm index 0746ec09c73..daca4705386 100644 --- a/code/modules/cargo/random_stock/large.dm +++ b/code/modules/cargo/random_stock/large.dm @@ -138,7 +138,8 @@ STOCK_ITEM_LARGE(dog, 0.2) var/dog = pick( \ /obj/structure/largecrate/animal/dog, \ /obj/structure/largecrate/animal/dog/amaskan, \ - /obj/structure/largecrate/animal/dog/pug \ + /obj/structure/largecrate/animal/dog/pug, \ + /obj/structure/largecrate/animal/dog/bullterrier \ ) new dog(L) diff --git a/code/modules/mob/living/simple_animal/hostile/commanded/guard_dog.dm b/code/modules/mob/living/simple_animal/hostile/commanded/guard_dog.dm index e09c43c8e90..90c193f04af 100644 --- a/code/modules/mob/living/simple_animal/hostile/commanded/guard_dog.dm +++ b/code/modules/mob/living/simple_animal/hostile/commanded/guard_dog.dm @@ -111,6 +111,14 @@ butchering_products = list(/obj/item/stack/material/animalhide = 2) +/mob/living/simple_animal/hostile/commanded/dog/bullterrier + name = "bull terrier" + desc = "An odd looking dog with a head in the shape of an egg." + + icon_state = "bullterrier" + icon_living = "bullterrier" + icon_dead = "bullterrier_dead" + /mob/living/simple_animal/hostile/commanded/dog/harron name = "domesticated ha'rron" short_name = "ha'rron" diff --git a/html/changelogs/wezzy_the_walter_update.yml b/html/changelogs/wezzy_the_walter_update.yml new file mode 100644 index 00000000000..037640dcd48 --- /dev/null +++ b/html/changelogs/wezzy_the_walter_update.yml @@ -0,0 +1,42 @@ +################################ +# 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 +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Wowzewow (Wezzy) + +# 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: "Adds Bull Terriers." + - bugfix: "Also adds inhands for pugs" diff --git a/icons/mob/npc/pets.dmi b/icons/mob/npc/pets.dmi index e627a80a9b7..9be550bb81e 100644 Binary files a/icons/mob/npc/pets.dmi and b/icons/mob/npc/pets.dmi differ