diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 8b94bccafb8..66b4ae5919d 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -892,6 +892,12 @@ icon_state = "beepskyplushie" phrase = "Ping!" +/obj/structure/plushie/ivancarp + name = "plush Ivan the carp" + desc = "A plushie in the spitting image of a russian raised carp." + icon_state = "carpplushie_russian" + phrase = "Blyat!" + //Small plushies. /obj/item/toy/plushie name = "generic small plush" diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index 6ed50584cc6..a3e2724e13c 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -53,4 +53,19 @@ if(istype(L)) if(prob(15)) L.Weaken(3) - L.visible_message("\the [src] knocks down \the [L]!") \ No newline at end of file + L.visible_message("\the [src] knocks down \the [L]!") + + +/mob/living/simple_animal/hostile/carp/russian + name = "Ivan the carp" + desc = "A feared space carp, nicknamed as Ivan by the old spacemen of Tau Ceti." + icon_state = "carp_russian" + icon_living = "carp_russian" + icon_dead = "carp_russian_dead" + maxHealth = 50 //stronk + health = 50 + +/mob/living/simple_animal/hostile/carp/russian/FindTarget() + . = ..() + if(.) + custom_emote(1,"spots a filthy capitalist!") \ No newline at end of file diff --git a/html/changelogs/Fire and Glory-FaG-Branch-2.yml b/html/changelogs/Fire and Glory-FaG-Branch-2.yml new file mode 100644 index 00000000000..1ce92980b7a --- /dev/null +++ b/html/changelogs/Fire and Glory-FaG-Branch-2.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: "Increasing Ivan the Space Carp's presence around the station." \ No newline at end of file diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi index deb19988ce6..825cc125f01 100644 Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi index b07089e7851..3b52b958b36 100644 Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ