cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes merge errors

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/mob_spawner_vr.dm
View File

@@ -84,7 +84,7 @@
if(destructible) if(destructible)
take_damage(Proj.get_structure_damage()) take_damage(Proj.get_structure_damage())
/obj/structure/mob_spawner/proc/take_damage(var/damage) /obj/structure/mob_spawner/take_damage(var/damage)
health -= damage health -= damage
if(health <= 0) if(health <= 0)
visible_message("<span class='warning'>\The [src] breaks apart!</span>") visible_message("<span class='warning'>\The [src] breaks apart!</span>")

2
code/modules/blob/blob.dm
View File

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