Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into labcoat

Conflicts:
	code/modules/clothing/suits/labcoat.dm
This should hopefully fix all that conflict going on. Hopefully.

code/game/objects/effects/aliens.dm

@@ -127,9 +127,6 @@
 	healthcheck()
 	return
 
-/obj/effect/alien/resin/attack_paw()
-	return attack_hand()
-
 /obj/effect/alien/resin/attackby(obj/item/weapon/W as obj, mob/user as mob)
 
 	var/aforce = W.force

code/game/objects/effects/effect_system.dm

@@ -653,10 +653,6 @@ steam.start() -- spawns the effect
 		if(metal==1 || prob(50))
 			del(src)
 
-	attack_paw(var/mob/user)
-		attack_hand(user)
-		return
-
 	attack_hand(var/mob/user)
 		if ((HULK in user.mutations) || (prob(75 - metal*25)))
 			user << "\blue You smash through the metal foam wall."