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

Conflicts:
	code/game/gamemodes/setupgame.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Machinery.dm

code/game/objects/effects/aliens.dm

@@ -108,14 +108,12 @@
 	health -= tforce
 	healthcheck()
 
-
-/obj/structure/alien/resin/attack_hand(mob/living/user)
-	if(HULK in user.mutations)
-		user.do_attack_animation(src)
-		user.visible_message("<span class='danger'>[user] destroys [src]!</span>")
-		health = 0
-		healthcheck()
-
+/obj/structure/alien/resin/attack_hulk(mob/living/carbon/human/user)
+	..(user, 1)
+	user.do_attack_animation(src)
+	user.visible_message("<span class='danger'>[user] destroys [src]!</span>")
+	health = 0
+	healthcheck()
 
 /obj/structure/alien/resin/attack_paw(mob/user)
 	return attack_hand(user)

code/game/objects/effects/effect_system.dm

@@ -966,16 +966,16 @@ steam.start() -- spawns the effect
 		qdel(src)
 		return
 
-/obj/structure/foamedmetal/attack_hand(var/mob/user)
-	if ((HULK in user.mutations) || (prob(75 - metal*25)))
+/obj/structure/foamedmetal/attack_hulk(mob/living/carbon/human/user)
+	..(user, 1)
+	if(prob(75 - metal*25))
 		user.visible_message("<span class='danger'>[user] smashes through the foamed metal.</span>", \
 						"<span class='danger'>You smash through the metal foam wall.</span>")
-
 		qdel(src)
-	else
-		user << "<span class='notice'>You hit the metal foam but bounce off it.</span>"
-	return
+	return 1
 
+/obj/structure/foamedmetal/attack_hand(var/mob/user)
+	user << "<span class='notice'>You hit the metal foam but bounce off it.</span>"
 
 /obj/structure/foamedmetal/attackby(var/obj/item/I, var/mob/user)