Polaris Sync & bugfix

- Polaris Sync
- Fixes bug being unable to pick up micros
- Fixes all conflicts that came with sync

code/game/objects/structures/flora.dm

@@ -75,6 +75,7 @@
 
 /obj/structure/flora/pottedplant
 	name = "potted plant"
+	desc = "Really ties the room together."
 	icon = 'icons/obj/plants.dmi'
 	icon_state = "plant-26"
 

code/game/objects/structures/kitchen_spike.dm

@@ -13,20 +13,21 @@
 	var/victim_name = "corpse"
 
 /obj/structure/kitchenspike/attackby(obj/item/weapon/grab/G as obj, mob/user as mob)
-	if(!istype(G, /obj/item/weapon/grab) || !G.affecting)
+	if(!istype(G, /obj/item/weapon/grab) || !ismob(G.affecting))
 		return
 	if(occupied)
 		user << "<span class = 'danger'>The spike already has something on it, finish collecting its meat first!</span>"
 	else
 		if(spike(G.affecting))
 			visible_message("<span class = 'danger'>[user] has forced [G.affecting] onto the spike, killing them instantly!</span>")
-			qdel(G.affecting)
+			var/mob/M = G.affecting
+			M.forceMove(src)
 			qdel(G)
+			qdel(M)
 		else
 			user << "<span class='danger'>They are too big for the spike, try something smaller!</span>"
 
 /obj/structure/kitchenspike/proc/spike(var/mob/living/victim)
-
 	if(!istype(victim))
 		return
 
@@ -52,9 +53,9 @@
 		return
 	meat--
 	new meat_type(get_turf(src))
-	if(src.meat > 1)
+	if(meat > 1)
 		user << "You remove some meat from \the [victim_name]."
-	else if(src.meat == 1)
+	else if(meat == 1)
 		user << "You remove the last piece of meat from \the [victim_name]!"
 		icon_state = "spike"
 		occupied = 0

code/game/objects/structures/under_wardrobe.dm

@@ -69,6 +69,7 @@
 		var/datum/category_item/underwear/selected_underwear = input(H, "Choose underwear:", "Choose underwear", H.all_underwear[UWC.name]) as null|anything in UWC.items
 		if(selected_underwear && CanUseTopic(H, default_state))
 			H.all_underwear[UWC.name] = selected_underwear
+			H.hide_underwear[UWC.name] = FALSE
 			. = TRUE
 	else if(href_list["underwear"] && href_list["tweak"])
 		var/underwear = href_list["underwear"]
@@ -80,6 +81,7 @@
 		var/new_metadata = gt.get_metadata(usr, get_metadata(H, underwear, gt), "Wardrobe Underwear Selection")
 		if(new_metadata)
 			set_metadata(H, underwear, gt, new_metadata)
+			H.hide_underwear[underwear] = FALSE
 			. = TRUE
 
 	if(.)