cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds a new Fungal Growth event, makes fungus re-harvestable (#21928)

Browse Source 
* the fungus is amongus

* us -> al

* Update code/game/objects/effects/decals/Cleanable/misc_cleanables.dm

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>

* Update code/game/objects/effects/decals/Cleanable/misc_cleanables.dm

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>

* Update code/game/objects/effects/decals/Cleanable/misc_cleanables.dm

fineeee

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>

---------

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
This commit is contained in:
Luc
2023-08-21 20:02:27 +01:00
committed by GitHub
co-authored by JimKil3
parent f39f68818f
commit b5613d239d
4 changed files with 49 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/decals/Cleanable/misc_cleanables.dm
+24
View File
@@ -277,6 +277,30 @@
icon_state = "flour"
color = "#D5820B"
scoop_reagents = list("fungus" = 10)
no_clear = TRUE
var/timer_id
/obj/effect/decal/cleanable/fungus/examine(mob/user)
. = ..()
if(no_scoop)
. += "<span class='notice'>There's not a lot here, you probably wouldn't be able to harvest anything useful.</span>"
else
. += "<span class='notice'>There's enough here to scrape into a beaker.</span>"
/obj/effect/decal/cleanable/fungus/on_scoop()
alpha = 128
no_scoop = TRUE
timer_id = addtimer(CALLBACK(src, PROC_REF(recreate)), rand(5 MINUTES, 10 MINUTES), TIMER_STOPPABLE)
/obj/effect/decal/cleanable/fungus/Destroy()
. = ..()
deltimer(timer_id)
/obj/effect/decal/cleanable/fungus/proc/recreate()
alpha = 255
reagents.add_reagent_list(scoop_reagents)
no_scoop = FALSE
/obj/effect/decal/cleanable/confetti //PARTY TIME!
name = "confetti"
code/game/objects/effects/effects.dm
+4
View File
@@ -125,6 +125,7 @@
to_chat(user, "<span class='notice'>[I] is full!</span>")
return
to_chat(user, "<span class='notice'>You scoop [src] into [I]!</span>")
on_scoop()
reagents.trans_to(I, reagents.total_volume)
if(!reagents.total_volume && !no_clear) //scooped up all of it
qdel(src)
@@ -144,3 +145,6 @@
/obj/effect/decal/blob_act(obj/structure/blob/B)
if(B && B.loc == loc)
qdel(src)
/obj/effect/decal/proc/on_scoop()
return