Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/17/2018_make_AI_great_again

# Conflicts resolved:
#	icons/mob/modifier_effects.dmi

code/game/objects/effects/item_pickup_ghost.dm

@@ -0,0 +1,19 @@
+/obj/effect/temporary_effect/item_pickup_ghost
+	anchored = 1
+	plane = MOB_PLANE
+	layer = ABOVE_MOB_LAYER
+	mouse_opacity = 0//just in case something dumb happens
+	time_to_die = 0.5 SECONDS
+	var/lifetime = 0.25 SECONDS //so it doesn't die before animation ends
+
+/obj/effect/temporary_effect/item_pickup_ghost/proc/assumeform(var/obj/item/picked_up)
+	icon = picked_up.icon
+	icon_state = picked_up.icon_state
+	pixel_x = picked_up.pixel_x
+	pixel_y = picked_up.pixel_y
+	color = picked_up.color
+
+/obj/effect/temporary_effect/item_pickup_ghost/proc/animate_towards(var/atom/target)
+	var/new_pixel_x = pixel_x + (target.x - src.x) * 32
+	var/new_pixel_y = pixel_y + (target.y - src.y) * 32
+	animate(src, pixel_x = new_pixel_x, pixel_y = new_pixel_y, transform = matrix()*0, time = lifetime)

code/game/objects/effects/portals.dm

@@ -1,3 +1,5 @@
+GLOBAL_LIST_BOILERPLATE(all_portals, /obj/effect/portal)
+
 /obj/effect/portal
 	name = "portal"
 	desc = "Looks unstable. Best to test it with the clown."

code/game/objects/effects/spiders.dm

@@ -217,7 +217,7 @@
 		skitter()
 
 	else if(isorgan(loc))
-		if(!amount_grown) amount_grown = 1
+		if(amount_grown < 0) amount_grown = 1
 		var/obj/item/organ/external/O = loc
 		if(!O.owner || O.owner.stat == DEAD || amount_grown > 80)
 			O.implants -= src
@@ -233,7 +233,7 @@
 	else if(prob(1))
 		src.visible_message("<span class='notice'>\The [src] skitters.</span>")
 
-	if(amount_grown)
+	if(amount_grown >= 0)
 		amount_grown += rand(0,2)
 
 /obj/effect/spider/spiderling/proc/skitter()