Merge remote-tracking branch 'remotes/upstream/master' into rodform

# Conflicts:
#	icons/mob/actions.dmi

code/datums/datacore.dm

@@ -135,7 +135,7 @@ proc/get_id_photo(var/mob/living/carbon/human/H)
 	if(H.gender == FEMALE)
 		g = "f"
 
-	var/icon/icobase = H.species.icobase
+	var/icon/icobase = head_organ.icobase //At this point all the organs would have the same icobase, so this is just recycling.
 
 	preview_icon = new /icon(icobase, "torso_[g]")
 	var/icon/temp
@@ -153,8 +153,8 @@ proc/get_id_photo(var/mob/living/carbon/human/H)
 	if(H.body_accessory && istype(H.body_accessory, /datum/body_accessory/tail))
 		temp = new/icon("icon" = H.body_accessory.icon, "icon_state" = H.body_accessory.icon_state)
 		preview_icon.Blend(temp, ICON_OVERLAY)
-	else if(H.species.tail && H.species.bodyflags & HAS_TAIL)
-		temp = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[H.species.tail]_s")
+	else if(H.tail && H.species.bodyflags & HAS_TAIL)
+		temp = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[H.tail]_s")
 		preview_icon.Blend(temp, ICON_OVERLAY)
 
 	for(var/obj/item/organ/external/E in H.organs)

code/datums/progressbar.dm

@@ -1,9 +1,12 @@
+#define PROGRESSBAR_HEIGHT 6
+
 /datum/progressbar
 	var/goal = 1
 	var/image/bar
 	var/shown = 0
 	var/mob/user
 	var/client/client
+	var/listindex
 
 /datum/progressbar/New(mob/User, goal_number, atom/target)
 	. = ..()
@@ -11,15 +14,21 @@
 		EXCEPTION("Invalid target given")
 	if(goal_number)
 		goal = goal_number
-	bar = image('icons/effects/progessbar.dmi', target, "prog_bar_0")
+	bar = image('icons/effects/progessbar.dmi', target, "prog_bar_0", HUD_LAYER)
+	bar.plane = HUD_PLANE
 	bar.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA
-	bar.pixel_y = 32
 	user = User
 	if(user)
 		client = user.client
 
+	LAZYINITLIST(user.progressbars)
+	LAZYINITLIST(user.progressbars[bar.loc])
+	var/list/bars = user.progressbars[bar.loc]
+	bars.Add(src)
+	listindex = bars.len
+	bar.pixel_y = 32 + (PROGRESSBAR_HEIGHT * (listindex - 1))
+
 /datum/progressbar/proc/update(progress)
-//	to_chat(world, "Update [progress] - [goal] - [(progress / goal)] - [((progress / goal) * 100)] - [round(((progress / goal) * 100), 5)]")
 	if(!user || !user.client)
 		shown = 0
 		return
@@ -35,8 +44,24 @@
 		user.client.images += bar
 		shown = 1
 
+/datum/progressbar/proc/shiftDown()
+	--listindex
+	bar.pixel_y -= PROGRESSBAR_HEIGHT
+
 /datum/progressbar/Destroy()
+	for(var/I in user.progressbars[bar.loc])
+		var/datum/progressbar/P = I
+		if(P != src && P.listindex > listindex)
+			P.shiftDown()
+
+	var/list/bars = user.progressbars[bar.loc]
+	bars.Remove(src)
+	if(!bars.len)
+		LAZYREMOVE(user.progressbars, bar.loc)
+
 	if(client)
 		client.images -= bar
 	qdel(bar)
-	. = ..()
+	. = ..()
+
+#undef PROGRESSBAR_HEIGHT