Resolved Conflicts:

code/modules/mob/living/simple_animal/constructs.dm
This commit is contained in:
ikarrus
2014-05-25 10:59:08 -06:00
248 changed files with 3636 additions and 3559 deletions
@@ -45,12 +45,6 @@
qdel(src)
/obj/structure/displaycase/meteorhit(obj/O as obj)
new /obj/item/weapon/shard( src.loc )
new /obj/item/weapon/gun/energy/laser/captain( src.loc )
qdel(src)
/obj/structure/displaycase/proc/healthcheck()
if (src.health <= 0)
if (!( src.destroyed ))