Lets families compile

code/modules/antagonists/_common/antag_helpers.dm

@@ -6,14 +6,3 @@
 			continue
 		if(!antag_type || !specific && istype(A,antag_type) || specific && A.type == antag_type)
 			. += A.owner
-
-//Get all teams [of type team_type]
-/proc/get_all_teams(team_type)
-	. = list()
-	for(var/V in GLOB.antagonists)
-		var/datum/antagonist/A = V
-		if(!A.owner)
-			continue
-		var/datum/team/T = A.get_team()
-		if(!team_type || istype(T,team_type))
-			. |= T

code/modules/antagonists/abductor/abductor.dm

@@ -97,7 +97,7 @@
 
 /datum/antagonist/abductor/admin_add(datum/mind/new_owner,mob/admin)
 	var/list/current_teams = list()
-	for(var/datum/team/abductor_team/T in get_all_teams(/datum/team/abductor_team))
+	for(var/datum/team/abductor_team/T in GLOB.antagonist_teams)
 		current_teams[T.name] = T
 	var/choice = input(admin,"Add to which team ?") as null|anything in (current_teams + "new team")
 	if (choice == "new team")

code/modules/antagonists/ert/ert.dm

@@ -181,8 +181,11 @@
 	add_antag_hud(antag_hud_type, antag_hud_name, M)
 	if(M.hud_used)
 		var/datum/hud/H = M.hud_used
-		H.wanted_lvl = new /obj/screen/wanted
-		H.infodisplay += H.wanted_lvl
+		var/atom/movable/screen/wanted/giving_wanted_lvl = new /atom/movable/screen/wanted()
+		H.wanted_lvl = giving_wanted_lvl
+		giving_wanted_lvl.hud = H
+		H.infodisplay += giving_wanted_lvl
+		H.mymob.client.screen += giving_wanted_lvl
 
 
 /datum/antagonist/ert/families/remove_innate_effects(mob/living/mob_override)

code/modules/antagonists/gang/cellphone.dm

@@ -9,7 +9,7 @@ GLOBAL_LIST_EMPTY(gangster_cell_phones)
 	var/gang_id = "Grove Street Families"
 	var/activated = FALSE
 
-/obj/item/gangster_cellphone/Initialize()
+/obj/item/gangster_cellphone/Initialize(mapload)
 	. = ..()
 	GLOB.gangster_cell_phones += src
 	become_hearing_sensitive()

code/modules/antagonists/gang/gang.dm

@@ -108,8 +108,11 @@
 	add_antag_hud(antag_hud_type, antag_hud_name, M)
 	if(M.hud_used)
 		var/datum/hud/H = M.hud_used
-		H.wanted_lvl = new /obj/screen/wanted
-		H.infodisplay += H.wanted_lvl
+		var/atom/movable/screen/wanted/giving_wanted_lvl = new /atom/movable/screen/wanted()
+		H.wanted_lvl = giving_wanted_lvl
+		giving_wanted_lvl.hud = H
+		H.infodisplay += giving_wanted_lvl
+		H.mymob.client.screen += giving_wanted_lvl
 
 /datum/antagonist/gang/remove_innate_effects(mob/living/mob_override)
 	if(starter_gangster)
@@ -404,7 +407,6 @@
 	else
 		gangster.current.fully_replace_character_name(gangster.current.real_name, original_name)
 
-
 /datum/antagonist/gang/dutch
 	show_in_antagpanel = TRUE
 	name = "Dutch van der Linde Outlaw"
@@ -538,11 +540,11 @@
 	acceptable_clothes = list(/obj/item/clothing/suit/driscoll,
 		/obj/item/clothing/under/costume/driscoll,
 		/obj/item/clothing/mask/gas/driscoll,
-		/obj/item/clothing/shoes/cowboy)
+		/obj/item/clothing/shoes/cowboyboots)
 	free_clothes = list(/obj/item/clothing/suit/driscoll,
 		/obj/item/clothing/under/costume/driscoll,
 		/obj/item/clothing/mask/gas/driscoll,
-		/obj/item/clothing/shoes/cowboy,
+		/obj/item/clothing/shoes/cowboyboots,
 		/obj/item/toy/crayon/spraycan)
 	antag_hud_name = "Drill"
 	gang_team_type = /datum/team/gang/driscoll

code/modules/antagonists/gang/handler.dm

@@ -411,14 +411,14 @@ GLOBAL_VAR(families_override_theme)
 
 			//Spawn the body
 			var/mob/living/carbon/human/cop = new(spawnloc)
-			chosen_candidate.client.prefs.safe_transfer_prefs_to(cop, is_antag = TRUE)
+			chosen_candidate.client.prefs.copy_to(cop)
 			cop.key = chosen_candidate.key
 
 			//Give antag datum
 			var/datum/antagonist/ert/families/ert_antag = new cops_to_send
 
 			cop.mind.add_antag_datum(ert_antag)
-			cop.mind.set_assigned_role(SSjob.GetJobType(ert_antag.ert_job_path))
+			cop.mind.assigned_role = ert_antag.name
 			SSjob.SendToLateJoin(cop)
 
 			//Logging and cleanup

code/modules/clothing/shoes/miscellaneous.dm

@@ -417,6 +417,8 @@
 	name = "cowboy boots"
 	desc = "A standard pair of brown cowboy boots."
 	icon_state = "cowboyboots"
+	permeability_coefficient = 0.05 //these are quite tall
+	pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes
 	can_be_tied = FALSE
 
 /obj/item/clothing/shoes/cowboyboots/black

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

@@ -208,6 +208,8 @@
 	if(!get_empty_held_indexes())
 		to_chat(src, "<span class='warning'>You have no empty hands!</span>")
 		return
+	if(I.on_offer_taken(giver, src)) // see if the item has special behavior for being accepted
+		return
 	if(!giver.temporarilyRemoveItemFromInventory(I))
 		visible_message("<span class='notice'>[src] tries to hand over [I] but it's stuck to them....", \
 						"<span class'notice'> You make a fool of yourself trying to give away an item stuck to your hands")