Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync

code/modules/mob/living/carbon/human/human.dm

@@ -1557,13 +1557,13 @@
 	return species.fire_icon_state
 
 // Called by job_controller.  Makes drones start with a permit, might be useful for other people later too.
-/mob/living/carbon/human/equip_post_job()	//Drone Permit moved to equip_survival_gear()
+/mob/living/carbon/human/equip_post_job()
 	var/braintype = get_FBP_type()
 	if(braintype == FBP_DRONE)
 		var/turf/T = get_turf(src)
 		var/obj/item/clothing/accessory/permit/drone/permit = new(T)
 		permit.set_name(real_name)
-		equip_to_appropriate_slot(permit) // If for some reason it can't find room, it'll still be on the floor.
+		equip_to_slot_or_del(permit, slot_in_backpack)
 
 /mob/living/carbon/human/proc/update_icon_special(var/mutable_appearance/ma, var/update_icons = TRUE) //For things such as teshari hiding and whatnot.
 	if(hiding) // Hiding? Carry on.
@@ -1575,4 +1575,4 @@
 	//Can put special species icon update proc calls here, if any are ever invented.
 
 	if(update_icons)
-		update_icons()
+		update_icons()

code/modules/mob/living/carbon/human/update_icons.dm

@@ -926,7 +926,7 @@ var/global/list/damage_icon_parts = list()
 		else
 			overlays_standing[SHOES_LAYER] = null
 			overlays_standing[SHOES_LAYER_ALT] = null
-	if(update_icons)   update_icons()
+	if(update_icons)   update_icons_layers()
 
 /mob/living/carbon/human/update_inv_s_store(var/update_icons=1)
 	if(QDESTROYING(src))