diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index f0950b91c5a..1cc8a0244ab 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -589,6 +589,20 @@ var/list/holder_mob_icon_cache = list() item_state = "corgi" w_class = ITEMSIZE_NORMAL +/obj/item/holder/ian + name = "corgi" + icon = 'icons/mob/npc/pets.dmi' + icon_state = "ian" + item_state = "ian" + w_class = ITEMSIZE_NORMAL + +/obj/item/holder/lisa + name = "lisa" + icon = 'icons/mob/npc/pets.dmi' + icon_state = "lisa" + item_state = "lisa" + w_class = ITEMSIZE_NORMAL + /obj/item/holder/fox name = "fox" icon = 'icons/mob/npc/pets.dmi' diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm index a3040ef8705..52464903e22 100644 --- a/code/modules/mob/living/simple_animal/friendly/corgi.dm +++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm @@ -43,12 +43,17 @@ name = "Ian" real_name = "Ian" //Intended to hold the name without altering it. gender = MALE - desc = "It's a corgi." + desc = "It's Ian the corgi." + icon = 'icons/mob/npc/pets.dmi' + icon_state = "ian" + icon_living = "ian" + icon_dead = "ian_dead" named = TRUE //var/obj/movement_target response_help = "pets" response_disarm = "bops" response_harm = "kicks" + holder_type = /obj/item/holder/ian /mob/living/simple_animal/corgi/Ian/think() ..() @@ -111,6 +116,7 @@ icon_state = "puppy" icon_living = "puppy" icon_dead = "puppy_dead" + holder_type = /obj/item/holder/corgi butchering_products = list(/obj/item/stack/material/animalhide/corgi = 1) @@ -135,6 +141,7 @@ response_help = "pets" response_disarm = "bops" response_harm = "kicks" + holder_type = /obj/item/holder/lisa var/puppies = 0 //Lisa already has a cute bow! diff --git a/html/changelogs/niennab-ianandcorgiresprite.yml b/html/changelogs/niennab-ianandcorgiresprite.yml new file mode 100644 index 00000000000..b38b7c4380b --- /dev/null +++ b/html/changelogs/niennab-ianandcorgiresprite.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: Niennab + +# 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: "Added a unique sprite for ian. Changed code to reference ian instead of corgi." + - tweak: "Tweaked the corgi, lisa, puppy, ian plushie, and ian clothing sprites." diff --git a/icons/mob/corgi_head.dmi b/icons/mob/corgi_head.dmi index 105bdf47502..a2069d2dee9 100644 Binary files a/icons/mob/corgi_head.dmi and b/icons/mob/corgi_head.dmi differ diff --git a/icons/mob/npc/pets.dmi b/icons/mob/npc/pets.dmi index b88b65f2cad..6f742a190db 100644 Binary files a/icons/mob/npc/pets.dmi and b/icons/mob/npc/pets.dmi differ diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi index ffcce968c8b..6e50993ac19 100644 Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ