diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 76719ebd45e..d53508ae6cb 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -77,12 +77,47 @@ name = "potted plant" icon = 'icons/obj/plants.dmi' icon_state = "plant-26" + var/dead = 0 + +/obj/structure/flora/pottedplant/proc/death() + if (!dead) + icon_state = "plant-dead" + name = "dead [name]" + desc = "It looks dead." + dead = 1 +//No complex interactions, just make them fragile +/obj/structure/flora/pottedplant/ex_act() + death() + return ..() + +/obj/structure/flora/pottedplant/fire_act() + death() + return ..() + +/obj/structure/flora/pottedplant/attackby(obj/item/weapon/W, mob/user) + if (W.edge) + user.visible_message(span("warning", "[user] cuts down the [src]")) + death() + return 1 + return ..() + +/obj/structure/flora/pottedplant/bullet_act(var/obj/item/projectile/Proj) + if (prob(Proj.damage*2)) + death() + return 1 + return ..() //Added random icon selection for potted plants. //It was silly they always used the same sprite when we have 26 sprites of them in the icon file /obj/structure/flora/pottedplant/random/New() ..() - var/number = rand(1,26) + var/number = rand(1,36) + if (number == 36) + if (prob(90))//Make the wierd one rarer + number = rand(1,35) + else + desc = "It stares into your soul." + if (number < 10) number = "0[number]" icon_state = "plant-[number]" diff --git a/html/changelogs/Pottedplants.yml b/html/changelogs/Pottedplants.yml new file mode 100644 index 00000000000..625d4cdfbf5 --- /dev/null +++ b/html/changelogs/Pottedplants.yml @@ -0,0 +1,37 @@ +################################ +# 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: Nanako + +# 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: "Potted plants can now be killed by fire, explosions, sharp weapons and gunfire" + - imageadd: "Added a large bundle of new potted plant sprites" diff --git a/icons/obj/plants.dmi b/icons/obj/plants.dmi index d3f8e0eff7c..4de40862f60 100644 Binary files a/icons/obj/plants.dmi and b/icons/obj/plants.dmi differ