Merge branch 'master' of https://github.com/VOREStation/VOREStation into nanoformfixwoops

code/game/objects/items/devices/powersink.dm

@@ -4,6 +4,7 @@
 	name = "power sink"
 	desc = "A nulling power sink which drains energy from electrical systems."
 	icon_state = "powersink0"
+	icon = 'icons/obj/device.dmi'
 	w_class = ITEMSIZE_LARGE
 	throwforce = 5
 	throw_speed = 1

code/modules/vore/resizing/resize_vr.dm

@@ -271,7 +271,19 @@
 		return FALSE
 
 	var/mob/living/carbon/human/prey = tmob
-	if(!istype(prey))
+	var/can_pass = TRUE
+	if (isturf(prey.loc))
+		for (var/atom/movable/M in prey.loc)
+			if (prey == M)
+				continue
+			if (istype(M, /mob/living))
+				var/mob/living/L = M
+				if (!(M.CanPass(src, prey.loc) || get_effective_size(FALSE) - L.get_effective_size(TRUE) >= 0.75))
+					can_pass = FALSE
+				continue
+			if (!M.CanPass(src, prey.loc))
+				can_pass = FALSE
+	if(!istype(prey) || !can_pass)
 		//If they're not human, steppy shouldn't happen
 		return FALSE
 

config/alienwhitelist.txt

@@ -16,6 +16,7 @@ beyondmylife - Protean
 bothnevarbackwards - Diona
 bricker98 - Protean
 bricker98 - Black-Eyed Shadekin
+burritojustice - Protean
 camanis - Protean
 cameron653 - Protean
 cgr - Protean