Merge pull request #3047 from Citadel-Station-13/upstream-merge-31145

[MIRROR] Fixes aliums being able to attack the SM crystal
2017-10-01 16:31:44 -04:00
parent 1d3f476b2c 6e8f56edfd
commit f538d91fe8
1 changed files with 3 additions and 0 deletions
@@ -491,6 +491,9 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard)
 /obj/machinery/power/supermatter_shard/attack_paw(mob/user)
 	dust_mob(user, cause = "monkey attack")

+/obj/machinery/power/supermatter_shard/attack_alien(mob/user)
+	dust_mob(user, cause = "alien attack")
+
 /obj/machinery/power/supermatter_shard/attack_animal(mob/living/simple_animal/S)
 	var/murder
 	if(!S.melee_damage_upper && !S.melee_damage_lower)