[MIRROR] Changes the missing food icon test to cover ALL /obj's [MDB IGNORE] (#18139)

* Changes the missing food icon test to cover ALL /obj's

* Update implant.dm

* Hopefully fixes all the failing integration tests!

* Fixes more missing icons

* Even more icon fixes

* Hopefully that was all of them

* Okay now SURELY that's all of them

* I'm tired of this shit man

* Hopefully that's all, for real this time!

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
This commit is contained in:
SkyratBot
2022-12-29 01:30:05 +01:00
committed by GitHub
parent e72a2c5304
commit 5c6c91144c
170 changed files with 397 additions and 318 deletions

View File

@@ -5,7 +5,8 @@
name = "large mushrooms"
desc = "A number of large mushrooms, covered in a faint layer of ash and what can only be spores."
icon = 'icons/obj/lavaland/ash_flora.dmi'
icon_state = "l_mushroom"
icon_state = "l_mushroom1"
base_icon_state = "l_mushroom"
gender = PLURAL
layer = PROJECTILE_HIT_THRESHHOLD_LAYER //sporangiums up don't shoot
product_types = list(/obj/item/food/grown/ash_flora/shavings = 1)
@@ -18,23 +19,22 @@
harvest_message_true_thresholds = TRUE
harvest_verb = "pluck"
flora_flags = FLORA_HERBAL //not really accurate but what sound do hit mushrooms make anyway
var/base_icon
var/number_of_variants = 4
/obj/structure/flora/ash/Initialize(mapload)
. = ..()
base_icon = "[icon_state][rand(1, number_of_variants)]"
icon_state = base_icon
base_icon_state = "[base_icon_state][rand(1, number_of_variants)]"
icon_state = base_icon_state
/obj/structure/flora/ash/harvest(user)
if(!..())
return FALSE
icon_state = "[base_icon]p"
icon_state = "[base_icon_state]p"
return TRUE
/obj/structure/flora/ash/regrow()
..()
icon_state = base_icon
icon_state = base_icon_state
/obj/structure/flora/ash/tall_shroom //exists only so that the spawning check doesn't allow these spawning near other things
regrowth_time_low = 4200
@@ -42,7 +42,8 @@
/obj/structure/flora/ash/leaf_shroom
name = "leafy mushrooms"
desc = "A number of mushrooms, each of which surrounds a greenish sporangium with a number of leaf-like structures."
icon_state = "s_mushroom"
icon_state = "s_mushroom1"
base_icon_state = "s_mushroom"
product_types = list(/obj/item/food/grown/ash_flora/mushroom_leaf = 1)
harvested_name = "leafless mushrooms"
harvested_desc = "A bunch of formerly-leafed mushrooms, with their sporangiums exposed. Scandalous?"
@@ -57,7 +58,8 @@
/obj/structure/flora/ash/cap_shroom
name = "tall mushrooms"
desc = "Several mushrooms, the larger of which have a ring of conks at the midpoint of their stems."
icon_state = "r_mushroom"
icon_state = "r_mushroom1"
base_icon_state = "r_mushroom"
product_types = list(/obj/item/food/grown/ash_flora/mushroom_cap = 1)
harvested_name = "small mushrooms"
harvested_desc = "Several small mushrooms near the stumps of what likely were larger mushrooms."
@@ -72,7 +74,8 @@
/obj/structure/flora/ash/stem_shroom
name = "numerous mushrooms"
desc = "A large number of mushrooms, some of which have long, fleshy stems. They're radiating light!"
icon_state = "t_mushroom"
icon_state = "t_mushroom1"
base_icon_state = "t_mushroom"
light_range = 1.5
light_power = 2.1
product_types = list(/obj/item/food/grown/ash_flora/mushroom_stem = 1)
@@ -89,7 +92,8 @@
/obj/structure/flora/ash/cacti
name = "fruiting cacti"
desc = "Several prickly cacti, brimming with ripe fruit and covered in a thin layer of ash."
icon_state = "cactus"
icon_state = "cactus1"
base_icon_state = "cactus"
product_types = list(/obj/item/food/grown/ash_flora/cactus_fruit = 20, /obj/item/seeds/lavaland/cactus = 1)
harvested_name = "cacti"
harvested_desc = "A bunch of prickly cacti. You can see fruits slowly growing beneath the covering of ash."
@@ -109,7 +113,8 @@
/obj/structure/flora/ash/seraka
name = "seraka mushrooms"
desc = "A small cluster of seraka mushrooms. These must have come with the ashlizards."
icon_state = "seraka_mushroom"
icon_state = "seraka_mushroom1"
base_icon_state = "seraka_mushroom"
product_types = list(/obj/item/food/grown/ash_flora/seraka = 1)
harvested_name = "harvested seraka mushrooms"
harvested_desc = "A couple of small seraka mushrooms, with the larger ones clearly having been recently removed. They'll grow back... eventually."
@@ -126,7 +131,8 @@
/obj/structure/flora/ash/fireblossom
name = "fire blossom"
desc = "An odd flower that grows commonly near bodies of lava."
icon_state = "fireblossom"
icon_state = "fireblossom1"
base_icon_state = "fireblossom"
product_types = list(/obj/item/food/grown/ash_flora/fireblossom = 1)
harvested_name = "fire blossom stems"
harvested_desc = "A few fire blossom stems, missing their flowers."
@@ -142,7 +148,8 @@
/obj/structure/flora/ash/chilly
name = "springy grassy fruit"
desc = "A number of bright, springy blue fruiting plants. They seem to be unconcerned with the hardy, cold environment."
icon_state = "chilly_pepper"
icon_state = "chilly_pepper1"
base_icon_state = "chilly_pepper"
product_types = list(/obj/item/food/grown/icepepper = 1)
harvested_name = "springy grass"
harvested_desc = "A bunch of springy, bouncy fruiting grass, all picked. Or maybe they were never fruiting at all?"