Multiple Bugfixes (#15849)

This commit is contained in:
SleepyGemmy
2023-02-17 17:55:08 +01:00
committed by GitHub
parent de3518783b
commit 8464ddd0d9
9 changed files with 212 additions and 176 deletions
@@ -370,6 +370,7 @@
/obj/item/pinpointer,
/obj/item/plastique,
/obj/item/gun/projectile/pistol,
/obj/item/gun/projectile/silenced,
/obj/item/gun/energy/crossbow,
/obj/item/material/knife/trench,
/obj/item/ammo_casing/a145,
+3 -3
View File
@@ -920,10 +920,10 @@
)
/obj/random/loot
name = "random maintenance loot items"
name = "random maintenance loot"
desc = "Stuff for the maint-dwellers."
icon = 'icons/obj/items.dmi'
icon_state = "gift3"
icon = 'icons/holidays/christmas/presents.dmi'
icon_state = "gift1"
problist = list(
/obj/item/bluespace_crystal/artificial = 0.1,
/obj/item/bodybag = 0.7,
@@ -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
+10 -9
View File
@@ -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]"