mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-23 13:05:44 +01:00
Multiple Bugfixes (#15849)
This commit is contained in:
@@ -1,9 +1,12 @@
|
||||
/obj/structure/flora
|
||||
name = "flora parent object"
|
||||
desc = DESC_PARENT
|
||||
anchored = TRUE
|
||||
|
||||
/obj/structure/flora/tree
|
||||
name = "tree"
|
||||
density = 1
|
||||
desc = "A tree."
|
||||
density = TRUE
|
||||
pixel_x = -16
|
||||
layer = 9
|
||||
|
||||
@@ -56,8 +59,8 @@
|
||||
//rocks
|
||||
/obj/structure/flora/rock
|
||||
name = "rock"
|
||||
icon_state = "basalt"
|
||||
desc = "A rock."
|
||||
icon_state = "basalt"
|
||||
icon = 'icons/obj/flora/rocks_grey.dmi'
|
||||
density = TRUE
|
||||
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
|
||||
/obj/structure/flora/pottedplant
|
||||
name = "potted plant"
|
||||
desc = "A potted plant."
|
||||
icon = 'icons/obj/plants.dmi'
|
||||
icon_state = "plant-26"
|
||||
var/dead = 0
|
||||
anchored = FALSE
|
||||
var/dead = FALSE
|
||||
var/obj/item/stored_item
|
||||
|
||||
/obj/structure/flora/pottedplant/Destroy()
|
||||
@@ -11,11 +13,12 @@
|
||||
return ..()
|
||||
|
||||
/obj/structure/flora/pottedplant/proc/death()
|
||||
if (!dead)
|
||||
if(!dead)
|
||||
icon_state = "plant-dead"
|
||||
name = "dead [name]"
|
||||
desc = "It looks dead."
|
||||
dead = 1
|
||||
desc = "A dead potted plant."
|
||||
dead = TRUE
|
||||
|
||||
//No complex interactions, just make them fragile
|
||||
/obj/structure/flora/pottedplant/ex_act(var/severity = 2.0)
|
||||
death()
|
||||
@@ -68,13 +71,13 @@
|
||||
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
|
||||
// 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,36)
|
||||
if (number == 36)
|
||||
if (prob(90))//Make the weird one rarer
|
||||
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."
|
||||
@@ -120,8 +123,6 @@
|
||||
else
|
||||
desc = "Just your common, everyday houseplant."
|
||||
|
||||
|
||||
|
||||
if (number < 10)
|
||||
number = "0[number]"
|
||||
icon_state = "plant-[number]"
|
||||
Reference in New Issue
Block a user