Fixes merge errors

This commit is contained in:
Heroman
2019-07-28 07:08:18 +10:00
parent 759cc999b0
commit efb81f45fc
2 changed files with 2 additions and 2 deletions

View File

@@ -40,7 +40,7 @@
else
icon_state = "blob_damaged"
/obj/effect/blob/proc/take_damage(var/damage)
/obj/effect/blob/take_damage(var/damage) // VOREStation Edit
health -= damage
if(health < 0)
playsound(loc, 'sound/effects/splat.ogg', 50, 1)