cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-05 23:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rewriting the /obj/effect/glowshroom into a more general system.

Browse Source
This commit is contained in:
Zuhayr
2015-01-31 11:54:34 +10:30
parent d616040e8c
commit 0e93c1cf7b
8 changed files with 184 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/reagents/Chemistry-Reagents.dm
View File

@@ -1844,7 +1844,7 @@ datum
var/obj/effect/alien/weeds/alien_weeds = O
alien_weeds.health -= rand(15,35) // Kills alien weeds pretty fast
alien_weeds.healthcheck()
else if(istype(O,/obj/effect/shroom)) //even a small amount is enough to kill it
else if(istype(O,/obj/effect/plant)) //even a small amount is enough to kill it
del(O)
else if(istype(O,/obj/effect/plantsegment))
if(prob(50)) del(O) //Kills kudzu too.
@@ -2075,7 +2075,7 @@ datum
M.take_organ_damage(min(6*toxpwr, volume * toxpwr))
reaction_obj(var/obj/O, var/volume)
if((istype(O,/obj/item) || istype(O,/obj/effect/shroom/glow)) && prob(meltprob * 3))
if((istype(O,/obj/item) || istype(O,/obj/effect/plant)) && prob(meltprob * 3))
if(!O.unacidable)
var/obj/effect/decal/cleanable/molten_item/I = new/obj/effect/decal/cleanable/molten_item(O.loc)
I.desc = "Looks like this was \an [O] some time ago."