Yet Another Fugitives PR: Bounty Hunters, Features, Fixes, Treason, Removals! (#44802)

* mostly fixes in this commit

* removes old_god from the dme

* russian shuttle improvements

* TODO: fix the hook gun

* shotgun finished, next commit shuttle

* bounty hunting shuttle

* back up to speed on the dmis

* readds poster 46 and adds the shuttle finally

* dmi fixes

* traps need fixing, work out whatever is happening with synths

* super final touches, see desc

map ports + proper spawners, pinpointer and traps functional. other misc changes

* removes verb stuff from non verb stuff

* review (see desc)

antimagic checks and it now the two objects move inside each other instead

* dmi conflicts

* PLUNGERS. BEGONE.

code/game/objects/structures/traps.dm

@@ -6,17 +6,21 @@
 	density = FALSE
 	anchored = TRUE
 	alpha = 30 //initially quite hidden when not "recharging"
+	var/flare_message = "<span class='warning'>the trap flares brightly!</span>"
 	var/last_trigger = 0
 	var/time_between_triggers = 600 //takes a minute to recharge
 	var/charges = INFINITY
+	var/checks_antimagic = TRUE
 
 	var/list/static/ignore_typecache
 	var/list/mob/immune_minds = list()
 
+	var/sparks = TRUE
 	var/datum/effect_system/spark_spread/spark_system
 
 /obj/structure/trap/Initialize(mapload)
 	. = ..()
+	flare_message = "<span class='warning'>[src] flares brightly!</span>"
 	spark_system = new
 	spark_system.set_up(4,1,src)
 	spark_system.attach(src)
@@ -44,8 +48,9 @@
 /obj/structure/trap/proc/flare()
 	// Makes the trap visible, and starts the cooldown until it's
 	// able to be triggered again.
-	visible_message("<span class='warning'>[src] flares brightly!</span>")
-	spark_system.start()
+	visible_message(flare_message)
+	if(sparks)
+		spark_system.start()
 	alpha = 200
 	last_trigger = world.time
 	charges--
@@ -65,7 +70,7 @@
 		var/mob/M = AM
 		if(M.mind in immune_minds)
 			return
-		if(M.anti_magic_check())
+		if(checks_antimagic && M.anti_magic_check())
 			flare()
 			return
 	if(charges <= 0)
@@ -81,10 +86,85 @@
 	name = "shock trap"
 	desc = "A trap that will shock and render you immobile. You'd better avoid it."
 	icon_state = "trap-shock"
+	var/stun_time = 100
 
 /obj/structure/trap/stun/trap_effect(mob/living/L)
 	L.electrocute_act(30, src, safety=1) // electrocute act does a message.
-	L.Paralyze(100)
+	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/Crossed(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()
+	..()
+	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, 1)
+	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()
+	qdel(stored_trap)
+	QDEL_NULL(radio)
+	QDEL_NULL(spark_system)
+	. = ..()
 
 /obj/structure/trap/fire
 	name = "flame trap"