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

Conflicts:
	code/game/turfs/simulated/floor_types.dm

code/game/objects/effects/aliens.dm

@@ -98,6 +98,7 @@
 	return
 
 /obj/effect/alien/resin/attack_hand()
+	usr.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
 	if (HULK in usr.mutations)
 		usr << "<span class='notice'>You easily destroy the [name].</span>"
 		for(var/mob/O in oviewers(src))
@@ -124,6 +125,7 @@
 
 /obj/effect/alien/resin/attackby(obj/item/weapon/W as obj, mob/user as mob)
 
+	user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
 	var/aforce = W.force
 	health = max(0, health - aforce)
 	playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
@@ -231,6 +233,7 @@ Alien plants should do something if theres a lot of poison
 	return
 
 /obj/effect/alien/weeds/attackby(var/obj/item/weapon/W, var/mob/user)
+	user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
 	if(W.attack_verb.len)
 		visible_message("<span class='danger'>\The [src] have been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]</span>")
 	else
@@ -338,6 +341,7 @@ Alien plants should do something if theres a lot of poison
 
 	var/health = 100
 	var/status = GROWING //can be GROWING, GROWN or BURST; all mutually exclusive
+	flags = PROXMOVE
 
 /obj/effect/alien/egg/New()
 	if(config.aliens_allowed)

code/game/objects/effects/effect_system.dm

@@ -198,11 +198,11 @@ steam.start() -- spawns the effect
 	if (istype(M))
 		return 0
 	if (M.internal != null)
-		if(M.wear_mask && (M.wear_mask.flags & AIRTIGHT))
+		if(M.wear_mask && (M.wear_mask.item_flags & AIRTIGHT))
 			return 0
 		if(istype(M,/mob/living/carbon/human))
 			var/mob/living/carbon/human/H = M
-			if(H.head && (H.head.flags & AIRTIGHT))
+			if(H.head && (H.head.item_flags & AIRTIGHT))
 				return 0
 		return 0
 	return 1

code/game/objects/effects/spawners/vaultspawner.dm

@@ -1,26 +0,0 @@
-/obj/effect/vaultspawner
-	var/maxX = 6
-	var/maxY = 6
-	var/minX = 2
-	var/minY = 2
-
-/obj/effect/vaultspawner/New(turf/location as turf,lX = minX,uX = maxX,lY = minY,uY = maxY,var/type = null)
-	if(!type)
-		type = pick("sandstone","rock","alien")
-
-	var/lowBoundX = location.x
-	var/lowBoundY = location.y
-
-	var/hiBoundX = location.x + rand(lX,uX)
-	var/hiBoundY = location.y + rand(lY,uY)
-
-	var/z = location.z
-
-	for(var/i = lowBoundX,i<=hiBoundX,i++)
-		for(var/j = lowBoundY,j<=hiBoundY,j++)
-			if(i == lowBoundX || i == hiBoundX || j == lowBoundY || j == hiBoundY)
-				new /turf/simulated/wall/vault(locate(i,j,z),type)
-			else
-				new /turf/simulated/floor/vault(locate(i,j,z),type)
-
-	qdel(src)