cruuft

code/game/objects/structures/fugitive_role_spawners.dm

@@ -14,14 +14,6 @@
 	. = ..()
 	notify_ghosts("Hunters are waking up looking for refugees!", source = src, action=NOTIFY_ATTACK, flashwindow = FALSE, ignore_key = POLL_IGNORE_FUGITIVE)
 
-/obj/effect/mob_spawn/human/fugitive/special(mob/living/new_spawn)
-	var/datum/antagonist/fugitive_hunter/fughunter = new
-	fughunter.backstory = back_story
-	new_spawn.mind.add_antag_datum(fughunter)
-	fughunter.greet()
-	message_admins("[ADMIN_LOOKUPFLW(new_spawn)] has been made into a Fugitive Hunter by an event.")
-	log_game("[key_name(new_spawn)] was spawned as a Fugitive Hunter by an event.")
-
 /obj/effect/mob_spawn/human/fugitive/spacepol
 	name = "police pod"
 	desc = "A small sleeper typically used to put people to sleep for briefing on the mission."

code/game/objects/structures/ghost_role_spawners.dm

@@ -719,7 +719,6 @@
 
 /obj/effect/mob_spawn/human/pirate/special(mob/living/new_spawn)
 	new_spawn.fully_replace_character_name(new_spawn.real_name,generate_pirate_name())
-	new_spawn.mind.add_antag_datum(/datum/antagonist/pirate)
 
 /obj/effect/mob_spawn/human/pirate/proc/generate_pirate_name()
 	var/beggings = strings(PIRATE_NAMES_FILE, "beginnings")

code/game/objects/structures/traps.dm

@@ -98,94 +98,6 @@
 	L.electrocute_act(30, src, flags = SHOCK_NOGLOVES) // electrocute act does a message.
 	L.Paralyze(stun_time)
 
-/obj/structure/trap/stun/hunter
-	name = "bounty trap"
-	desc = "A trap that only goes off when a fugitive steps on it, announcing the location and stunning the target. You'd better avoid it."
-	icon = 'icons/obj/objects.dmi'
-	icon_state = "bounty_trap_on"
-	stun_time = 200
-	sparks = FALSE //the item version gives them off to prevent runtimes (see Destroy())
-	checks_antimagic  = FALSE
-	var/obj/item/bountytrap/stored_item
-	var/caught = FALSE
-
-/obj/structure/trap/stun/hunter/Initialize(mapload)
-	. = ..()
-	time_between_triggers = 10
-	flare_message = "<span class='warning'>[src] snaps shut!</span>"
-
-/obj/structure/trap/stun/hunter/Destroy()
-	if(!QDELETED(stored_item))
-		qdel(stored_item)
-	stored_item = null
-	return ..()
-
-/obj/structure/trap/stun/hunter/on_entered(datum/source, atom/movable/AM)
-	if(isliving(AM))
-		var/mob/living/L = AM
-		if(!L.mind?.has_antag_datum(/datum/antagonist/fugitive))
-			return
-	caught = TRUE
-	. = ..()
-
-/obj/structure/trap/stun/hunter/flare()
-	..()
-	var/turf/our_turf = get_turf(src)
-	if(!our_turf)
-		return
-	if(!stored_item)
-		qdel(src)
-		return
-	stored_item.forceMove(get_turf(src))
-	forceMove(stored_item)
-	if(caught)
-		stored_item.announce_fugitive()
-		caught = FALSE
-
-/obj/item/bountytrap
-	name = "bounty trap"
-	desc = "A trap that only goes off when a fugitive steps on it, announcing the location and stunning the target. It's currently inactive."
-	icon = 'icons/obj/objects.dmi'
-	icon_state = "bounty_trap_off"
-	var/obj/structure/trap/stun/hunter/stored_trap
-	var/obj/item/radio/radio
-	var/datum/effect_system/spark_spread/spark_system
-
-/obj/item/bountytrap/Initialize(mapload)
-	. = ..()
-	radio = new(src)
-	radio.subspace_transmission = TRUE
-	radio.canhear_range = 0
-	radio.recalculateChannels()
-	spark_system = new
-	spark_system.set_up(4,1,src)
-	spark_system.attach(src)
-	name = "[name] #[rand(1, 999)]"
-	stored_trap = new(src)
-	stored_trap.name = name
-	stored_trap.stored_item = src
-
-/obj/item/bountytrap/proc/announce_fugitive()
-	spark_system.start()
-	playsound(src, 'sound/machines/ding.ogg', 50, TRUE)
-	radio.talk_into(src, "Fugitive has triggered this trap in the [get_area_name(src)]!", RADIO_CHANNEL_COMMON)
-
-/obj/item/bountytrap/attack_self(mob/living/user)
-	var/turf/T = get_turf(src)
-	if(!user || !user.transferItemToLoc(src, T))//visibly unequips
-		return
-	to_chat(user, "<span class=notice>You set up [src]. Examine while close to disarm it.</span>")
-	stored_trap.forceMove(T)//moves trap to ground
-	forceMove(stored_trap)//moves item into trap
-
-/obj/item/bountytrap/Destroy()
-	if(!QDELETED(stored_trap))
-		qdel(stored_trap)
-	stored_trap = null
-	QDEL_NULL(radio)
-	QDEL_NULL(spark_system)
-	. = ..()
-
 /obj/structure/trap/fire
 	name = "flame trap"
 	desc = "A trap that will set you ablaze. You'd better avoid it."

code/modules/antagonists/fugitive/fugitive_outfits.dm

@@ -152,7 +152,3 @@
 	ears = /obj/item/radio/headset
 	id = /obj/item/card/id
 	r_hand = /obj/item/storage/firstaid/regular
-
-	backpack_contents = list(
-		/obj/item/bountytrap = 4
-		)