diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index 94935b19c67..87125b16a69 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -16,7 +16,7 @@ var/item = spawn_item() if (has_postspawn && item) post_spawn(item) - + return INITIALIZE_HINT_QDEL // this function should return a specific item to spawn @@ -293,6 +293,7 @@ /obj/structure/plushie/drone, /obj/structure/plushie/carp, /obj/structure/plushie/beepsky, + /obj/structure/plushie/ivancarp, /obj/item/toy/plushie/nymph, /obj/item/toy/plushie/mouse, /obj/item/toy/plushie/kitten, @@ -826,7 +827,7 @@ spawnlist = list( /obj/structure/reagent_dispensers/cookingoil ) - + /obj/random/sword name = "random sword" desc = "This is a random sword." diff --git a/code/modules/cargo/randomstock.dm b/code/modules/cargo/randomstock.dm index 6dea5046de6..9262ba2ab41 100644 --- a/code/modules/cargo/randomstock.dm +++ b/code/modules/cargo/randomstock.dm @@ -296,6 +296,7 @@ var/list/global/random_stock_large = list( /mob/living/simple_animal/hostile/shantak = 0.7, /mob/living/simple_animal/hostile/bear = 0.5, /mob/living/simple_animal/hostile/carp = 1.5, + /mob/living/simple_animal/hostile/carp/russian = 0.3, "cratey" = 1 ) diff --git a/html/changelogs/Fire-and-Glory - misc-things.yml b/html/changelogs/Fire-and-Glory - misc-things.yml new file mode 100644 index 00000000000..d513aaafb90 --- /dev/null +++ b/html/changelogs/Fire-and-Glory - misc-things.yml @@ -0,0 +1,40 @@ +################################ +# 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 +################################# + +# 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: "Ivan the carp is invading your arcades and cargo warehouse." + - bugfix: "Stopped the Tajaran industrial RIG chestpiece from obscuring the cat's mouth when he looks south with no helmet." + - bugfix: "With any luck, stopped cigarettes from phasing in and out of existence when held. Tell me directly if this keeps being a thing." + - tweak: "Even if you hide a brick in your chin like Skull132, you shouldn't expose it to space, the paramedic Rescue RIG has been modified to reflect this." \ No newline at end of file diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 3eb6cf8bf65..c2c206bd963 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/species/tajaran/suit.dmi b/icons/mob/species/tajaran/suit.dmi index 40610f637d2..93ee7dba0d6 100644 Binary files a/icons/mob/species/tajaran/suit.dmi and b/icons/mob/species/tajaran/suit.dmi differ