cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Randomless Kirby plants (#23376)

Browse Source 
* Kirby randomless

* Whoops

* Whoops x2

* Maps Script & missing plant

* Spellcheck

* Plant eye fix

* Update code/game/objects/structures/flora.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* double pipe fix

* errant sign removal

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
This commit is contained in:
Aylong
2024-01-14 13:22:18 +00:00
committed by GitHub
co-authored by Burzah S34N
parent 685a196adc
commit 4e76e777d9
8 changed files with 329 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/flora.dm
+114 -6
View File
@@ -253,11 +253,11 @@
. = ..()
icon_state = "fullgrass_[rand(1, 3)]"
// Kirby plants
/obj/item/kirbyplants
name = "potted plant"
icon = 'icons/obj/flora/plants.dmi'
icon_state = "plant-1"
icon_state = "random_plant"
anchored = FALSE
layer = ABOVE_MOB_LAYER
w_class = WEIGHT_CLASS_HUGE
@@ -270,9 +270,10 @@
/obj/item/kirbyplants/Initialize(mapload)
. = ..()
icon_state = "plant-[rand(1,35)]"
if(prob(1))
icon_state = "plant-36"
if(prob(1) && icon_state == "random_plant")
icon_state = "plant-eye"
if(icon_state == "random_plant")
icon_state = "plant-[rand(1, 34)]"
AddComponent(/datum/component/two_handed, require_twohands = TRUE)
/obj/item/kirbyplants/Destroy()
@@ -314,10 +315,117 @@
..()
unhide_user(user)
/obj/item/kirbyplants/plant1
icon_state = "plant-1"
/obj/item/kirbyplants/plant2
icon_state = "plant-2"
/obj/item/kirbyplants/plant3
icon_state = "plant-3"
/obj/item/kirbyplants/plant4
icon_state = "plant-4"
/obj/item/kirbyplants/plant5
icon_state = "plant-5"
/obj/item/kirbyplants/plant6
icon_state = "plant-6"
/obj/item/kirbyplants/plant7
icon_state = "plant-7"
/obj/item/kirbyplants/plant8
icon_state = "plant-8"
/obj/item/kirbyplants/plant9
icon_state = "plant-9"
/obj/item/kirbyplants/plant10
icon_state = "plant-10"
/obj/item/kirbyplants/plant11
icon_state = "plant-11"
/obj/item/kirbyplants/plant12
icon_state = "plant-12"
/obj/item/kirbyplants/plant13
icon_state = "plant-13"
/obj/item/kirbyplants/plant14
icon_state = "plant-14"
/obj/item/kirbyplants/plant15
icon_state = "plant-15"
/obj/item/kirbyplants/plant16
icon_state = "plant-16"
/obj/item/kirbyplants/plant17
icon_state = "plant-17"
/obj/item/kirbyplants/plant18
icon_state = "plant-18"
/obj/item/kirbyplants/plant19
icon_state = "plant-19"
/obj/item/kirbyplants/plant20
icon_state = "plant-20"
/obj/item/kirbyplants/plant21
icon_state = "plant-21"
/obj/item/kirbyplants/plant22
icon_state = "plant-22"
/obj/item/kirbyplants/plant23
icon_state = "plant-23"
/obj/item/kirbyplants/plant24
icon_state = "plant-24"
/obj/item/kirbyplants/plant25
icon_state = "plant-25"
/obj/item/kirbyplants/plant26
icon_state = "plant-26"
/obj/item/kirbyplants/plant27
icon_state = "plant-27"
/obj/item/kirbyplants/plant28
icon_state = "plant-28"
/obj/item/kirbyplants/plant29
icon_state = "plant-29"
/obj/item/kirbyplants/plant30
icon_state = "plant-30"
/obj/item/kirbyplants/plant31
icon_state = "plant-31"
/obj/item/kirbyplants/plant32
icon_state = "plant-32"
/obj/item/kirbyplants/plant33
icon_state = "plant-33"
/obj/item/kirbyplants/plant34
icon_state = "plant-34"
/obj/item/kirbyplants/applebush
icon_state = "applebush"
/obj/item/kirbyplants/dead
icon_state = "plant-dead"
/obj/item/kirbyplants/dead/rd
name = "\improper RD's potted plant"
desc = "A gift from the botanical staff, presented after the RD's reassignment. There's a tag on it that says \"Y'all come back now, y'hear?\"\nIt doesn't look very healthy..."
icon_state = "plant-dead"
//a rock is flora according to where the icon file is
//and now these defines