diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 9e62448a426..51702c13bbb 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -142,10 +142,52 @@ ..() var/number = rand(1,36) if (number == 36) - if (prob(90))//Make the wierd one rarer + if (prob(90))//Make the weird one rarer number = rand(1,35) else - desc = "It stares into your soul." + desc = "A half-sentient plant borne from a mishap in a Zeng-Hu genetics lab." + + switch(number) //Wezzy's cool new plant description code. Special thanks to Sindorman. + if(3) + desc = "A bouquet of Bieselite flora." + if(4) + desc = "A bamboo plant. Used widely in Japanese crafts." + if(5) + desc = "Some kind of fern." + if(7) + desc = "A reedy plant mostly used for decoration in Skrell homes, admired for its luxuriant stalks." + if(9) + desc = "A fleshy cave dwelling plant with huge nodules for flowers." + if(9) + desc = "A scrubby cactus adapted to the Moghes deserts." + if(13) + desc = "A hardy succulent adapted to the Moghes deserts." + if(14) + desc = "That's a huge flower. Previously, the petals would be used in dyes for unathi garb. Now it's more of a decorative plant." + if(15) + desc = "A pitiful pot of stubby flowers." + if(18) + desc = "An orchid plant. As beautiful as it is delicate." + if(19) + desc = "A ropey, aquatic plant with crystaline flowers." + if(20) + desc = "A bioluminescent half-plant half-fungus hybrid. Said to come from Sedantis I." + if(22) + desc = "A cone shrub. Sadly doesn't come from Coney Island." + if(26) + desc = "A bulrush. Commonly referred to as cattail." + if(27) + desc = "A rose bush. Don't prick yourself." + if(32) + desc = "A woody shrub." + if(33) + desc = "A woody shrub. Seems to be in need of watering." + if(34) + desc = "A woody shrub. This one seems to be in bloom. It's just like one of my japanese animes." + else + desc = "Just your common, everyday houseplant." + + if (number < 10) number = "0[number]" @@ -266,4 +308,4 @@ /obj/structure/flora/ausbushes/fullgrass/New() ..() - icon_state = "fullgrass_[rand(1, 3)]" + icon_state = "fullgrass_[rand(1, 3)]" \ No newline at end of file diff --git a/html/changelogs/madeofcheesechangelog.yml b/html/changelogs/madeofcheesechangelog.yml new file mode 100644 index 00000000000..ea44b764a5d --- /dev/null +++ b/html/changelogs/madeofcheesechangelog.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 + +# 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: + - tweak: "Changed potted plant sprites to be more consistent across the board." + - tweak: "Adds flavortext to some plants." diff --git a/icons/obj/plants.dmi b/icons/obj/plants.dmi index 4de40862f60..92de6e8e81c 100644 Binary files a/icons/obj/plants.dmi and b/icons/obj/plants.dmi differ