cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 07:38:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackAnimation

Browse Source 
Conflicts:
	code/modules/mob/living/living.dm
This commit is contained in:
phil235
2014-11-04 18:55:07 +01:00
parent 1506383b2c d88e1684ca
commit 74f8a08522
218 changed files with 4643 additions and 2941 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/glowshroom.dm
+7 -1
View File
@@ -140,4 +140,10 @@
/obj/effect/glowshroom/proc/CheckEndurance()
if(endurance <= 0)
qdel(src)
qdel(src)
/obj/effect/glowshroom/acid_act(var/acidpwr, var/toxpwr, var/acid_volume)
visible_message("<span class='danger'>[src] melts away!</span>")
var/obj/effect/decal/cleanable/molten_item/I = new (get_turf(src))
I.desc = "Looks like this was \an [src] some time ago."
qdel(src)