Replace /pottedplant/random with /random/pottedplant/ (#16944)

* madness

* changelog

* haha changelog fail

* post merge fix

* huh

* post merge fix

* aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

---------

Co-authored-by: DreamySkrell <>
This commit is contained in:
DreamySkrell
2023-08-04 00:51:25 +02:00
committed by GitHub
parent 038760a68a
commit d0c758cdf1
32 changed files with 378 additions and 398 deletions
@@ -71,66 +71,6 @@
return 1
return ..()
/obj/structure/flora/pottedplant/random
name = "potted plant (DEPRECATED)"
desc = "use /obj/random/pottedplant/ instead"
/obj/structure/flora/pottedplant/random/New()
..()
name = "potted plant"
desc = "A potted plant."
var/number = rand(1,36)
if (number == 36)
if (prob(90)) // Make the weird one rarer
number = rand(1,35)
else if(!desc)
desc = "A half-sentient plant borne from a mishap in a Zeng-Hu genetics lab."
if(!desc)
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]"
icon_state = "plant-[number]"
/obj/structure/flora/pottedplant/applebush
name = "decorative potted plant"
desc = "This is a decorative shrub. It's been trimmed into the shape of an apple."