Fix many instances of "the the"

code/game/objects/buckling.dm

@@ -47,9 +47,9 @@
 		return FALSE
 	if(!M.can_buckle() && !force)
 		if(M == usr)
-			to_chat(M, "<span class='warning'>You are unable to buckle yourself to the [src]!</span>")
+			to_chat(M, "<span class='warning'>You are unable to buckle yourself to [src]!</span>")
 		else
-			to_chat(usr, "<span class='warning'>You are unable to buckle [M] to the [src]!</span>")
+			to_chat(usr, "<span class='warning'>You are unable to buckle [M] to [src]!</span>")
 		return FALSE
 
 	if(M.pulledby && buckle_prevents_pull)

code/game/objects/items/RCD.dm

@@ -8,7 +8,7 @@ RCD
 ARCD
 */
 
-obj/item/construction
+/obj/item/construction
 	opacity = 0
 	density = FALSE
 	anchored = FALSE
@@ -32,7 +32,7 @@ obj/item/construction
 
 /obj/item/construction/Initialize()
 	. = ..()
-	desc = "A [src]. It currently holds [matter]/[max_matter] matter-units."
+	desc = "\A [src]. It currently holds [matter]/[max_matter] matter-units."
 	spark_system = new /datum/effect_system/spark_spread
 	spark_system.set_up(5, 0, src)
 	spark_system.attach(src)
@@ -49,7 +49,7 @@ obj/item/construction
 	if(istype(W, /obj/item/rcd_ammo))
 		var/obj/item/rcd_ammo/R = W
 		if((matter + R.ammoamt) > max_matter)
-			to_chat(user, "<span class='warning'>The [src] can't hold any more matter-units!</span>")
+			to_chat(user, "<span class='warning'>[src] can't hold any more matter-units!</span>")
 			return
 		qdel(W)
 		matter += R.ammoamt
@@ -60,7 +60,7 @@ obj/item/construction
 	else if(istype(W, /obj/item/stack/sheet/plasteel))
 		loaded = loadwithsheets(W, plasteelmultiplier*sheetmultiplier, user) //Plasteel is worth 3 times more than glass or metal
 	if(loaded)
-		to_chat(user, "<span class='notice'>The [src] now holds [matter]/[max_matter] matter-units.</span>")
+		to_chat(user, "<span class='notice'>[src] now holds [matter]/[max_matter] matter-units.</span>")
 		desc = "A RCD. It currently holds [matter]/[max_matter] matter-units."
 	else
 		return ..()
@@ -72,9 +72,9 @@ obj/item/construction
 		S.use(amount_to_use)
 		matter += value*amount_to_use
 		playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
-		to_chat(user, "<span class='notice'>You insert [amount_to_use] [S.name] sheets into the [src]. </span>")
+		to_chat(user, "<span class='notice'>You insert [amount_to_use] [S.name] sheets into [src]. </span>")
 		return 1
-	to_chat(user, "<span class='warning'>You can't insert any more [S.name] sheets into the [src]!</span>")
+	to_chat(user, "<span class='warning'>You can't insert any more [S.name] sheets into [src]!</span>")
 	return 0
 
 /obj/item/construction/proc/activate()
@@ -91,7 +91,7 @@ obj/item/construction
 			to_chat(user, no_ammo_message)
 		return 0
 	matter -= amount
-	desc = "A [src]. It currently holds [matter]/[max_matter] matter-units."
+	desc = "\A [src]. It currently holds [matter]/[max_matter] matter-units."
 	update_icon()
 	return 1
 
@@ -103,7 +103,7 @@ obj/item/construction
 
 /obj/item/construction/proc/range_check(atom/A, mob/user)
 	if(!(A in view(7, get_turf(user))))
-		to_chat(user, "<span class='warning'>The \'Out of Range\' light on the [src] blinks red.</span>")
+		to_chat(user, "<span class='warning'>The \'Out of Range\' light on [src] blinks red.</span>")
 		return FALSE
 	else
 		return TRUE

code/game/objects/items/RCL.dm

@@ -42,7 +42,7 @@
 		else
 			return
 		update_icon()
-		to_chat(user, "<span class='notice'>You add the cables to the [src]. It now contains [loaded.amount].</span>")
+		to_chat(user, "<span class='notice'>You add the cables to [src]. It now contains [loaded.amount].</span>")
 	else if(istype(W, /obj/item/screwdriver))
 		if(!loaded)
 			return

code/game/objects/items/RSF.dm

@@ -135,9 +135,9 @@ RSF
 /obj/item/cookiesynth/emag_act(mob/user)
 	emagged = !emagged
 	if(emagged)
-		to_chat(user, "<span class='warning'>You short out the [src]'s reagent safety checker!</span>")
+		to_chat(user, "<span class='warning'>You short out [src]'s reagent safety checker!</span>")
 	else
-		to_chat(user, "<span class='warning'>You reset the [src]'s reagent safety checker!</span>")
+		to_chat(user, "<span class='warning'>You reset [src]'s reagent safety checker!</span>")
 		toxin = 0
 
 /obj/item/cookiesynth/attack_self(mob/user)
@@ -166,7 +166,7 @@ RSF
 	if (!(istype(A, /obj/structure/table) || isfloorturf(A)))
 		return
 	if(matter < 1)
-		to_chat(user, "<span class='warning'>The [src] doesn't have enough matter left. Wait for it to recharge!</span>")
+		to_chat(user, "<span class='warning'>[src] doesn't have enough matter left. Wait for it to recharge!</span>")
 		return
 	if(iscyborg(user))
 		var/mob/living/silicon/robot/R = user

code/game/objects/items/cigs_lighters.dm

@@ -77,11 +77,11 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	var/obj/item/clothing/mask/cigarette/cig = help_light_cig(M)
 	if(lit && cig && user.a_intent == INTENT_HELP)
 		if(cig.lit)
-			to_chat(user, "<span class='notice'>The [cig.name] is already lit.</span>")
+			to_chat(user, "<span class='notice'>[cig] is already lit.</span>")
 		if(M == user)
 			cig.attackby(src, user)
 		else
-			cig.light("<span class='notice'>[user] holds the [name] out for [M], and lights the [cig.name].</span>")
+			cig.light("<span class='notice'>[user] holds [src] out for [M], and lights [cig].</span>")
 	else
 		..()
 
@@ -627,7 +627,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 //VAPE NATION//
 ///////////////
 /obj/item/clothing/mask/vape
-	name = "E-Cigarette"
+	name = "\improper E-Cigarette"
 	desc = "A classy and highly sophisticated electronic cigarette, for classy and dignified gentlemen. A warning label reads \"Warning: Do not fill with flammable materials.\""//<<< i'd vape to that.
 	icon = 'icons/obj/clothing/masks.dmi'
 	icon_state = null
@@ -659,23 +659,23 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 		if(reagents.total_volume < chem_volume)
 			if(O.reagents.total_volume > 0)
 				O.reagents.trans_to(src,25)
-				to_chat(user, "<span class='notice'>You add the contents of [O] to the [src]</span>")
+				to_chat(user, "<span class='notice'>You add the contents of [O] to [src].</span>")
 			else
-				to_chat(user, "<span class='warning'>The [O] is empty!</span>")
+				to_chat(user, "<span class='warning'>[O] is empty!</span>")
 		else
 			to_chat(user, "<span class='warning'>[src] can't hold anymore reagents!</span>")
 
 	if(istype(O, /obj/item/screwdriver))
 		if(!screw)
 			screw = 1
-			to_chat(user, "<span class='notice'>You open the cap on the [src]</span>")
+			to_chat(user, "<span class='notice'>You open the cap on [src].</span>")
 			if(super)
 				add_overlay("vapeopen_med")
 			else
 				add_overlay("vapeopen_low")
 		else
 			screw = 0
-			to_chat(user, "<span class='notice'>You close the cap on the [src]</span>")
+			to_chat(user, "<span class='notice'>You close the cap on [src].</span>")
 			cut_overlays()
 
 	if(istype(O, /obj/item/device/multitool))
@@ -683,16 +683,16 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 			if(!super)
 				cut_overlays()
 				super = 1
-				to_chat(user, "<span class='notice'>You increase the voltage in the [src]</span>")
+				to_chat(user, "<span class='notice'>You increase the voltage of [src].</span>")
 				add_overlay("vapeopen_med")
 			else
 				cut_overlays()
 				super = 0
-				to_chat(user, "<span class='notice'>You decrease the voltage in the [src]</span>")
+				to_chat(user, "<span class='notice'>You decrease the voltage of [src].</span>")
 				add_overlay("vapeopen_low")
 
 		if(screw && emagged)
-			to_chat(user, "<span class='notice'>The [name] can't be modified!</span>")
+			to_chat(user, "<span class='notice'>[src] can't be modified!</span>")
 
 
 /obj/item/clothing/mask/vape/emag_act(mob/user)// I WON'T REGRET WRITTING THIS, SURLY.
@@ -701,19 +701,19 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 			cut_overlays()
 			emagged = TRUE
 			super = 0
-			to_chat(user, "<span class='warning'>You maximize the voltage in the [src]</span>")
+			to_chat(user, "<span class='warning'>You maximize the voltage of [src].</span>")
 			add_overlay("vapeopen_high")
 			var/datum/effect_system/spark_spread/sp = new /datum/effect_system/spark_spread //for effect
 			sp.set_up(5, 1, src)
 			sp.start()
 		else
-			to_chat(user, "<span class='warning'>The [name] is already emagged!</span>")
+			to_chat(user, "<span class='warning'>[src] is already emagged!</span>")
 	else
-		to_chat(user, "<span class='notice'>You need to open the cap to do that</span>")
+		to_chat(user, "<span class='notice'>You need to open the cap to do that.</span>")
 
 /obj/item/clothing/mask/vape/attack_self(mob/user)
 	if(reagents.total_volume > 0)
-		to_chat(user, "<span class='notice'>you empty [src] of all reagents.</span>")
+		to_chat(user, "<span class='notice'>You empty [src] of all reagents.</span>")
 		reagents.clear_reagents()
 	return
 
@@ -764,7 +764,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 
 	if(!reagents.total_volume)
 		if(ismob(loc))
-			to_chat(M, "<span class='notice'>The [name] is empty!</span>")
+			to_chat(M, "<span class='notice'>[src] is empty!</span>")
 			STOP_PROCESSING(SSobj, src)
 			//it's reusable so it won't unequip when empty
 		return
@@ -788,7 +788,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 			var/datum/effect_system/spark_spread/sp = new /datum/effect_system/spark_spread
 			sp.set_up(5, 1, src)
 			sp.start()
-			to_chat(M, "<span class='userdanger'>The [name] suddenly explodes in your mouth!</span>")
+			to_chat(M, "<span class='userdanger'>[src] suddenly explodes in your mouth!</span>")
 			qdel(src)
 			return
 

code/game/objects/items/devices/traitordevices.dm

@@ -241,7 +241,7 @@ effective or pretty fucking useless.
 	var/range = 12
 
 /obj/item/device/jammer/attack_self(mob/user)
-	to_chat(user,"<span class='notice'>You [active ? "deactivate" : "activate"] the [src].</span>")
+	to_chat(user,"<span class='notice'>You [active ? "deactivate" : "activate"] [src].</span>")
 	active = !active
 	if(active)
 		GLOB.active_jammers |= src

code/game/objects/items/grenades/plastic.dm

@@ -99,7 +99,7 @@
 	if(ismob(AM))
 		return
 
-	to_chat(user, "<span class='notice'>You start planting the [src]. The timer is set to [det_time]...</span>")
+	to_chat(user, "<span class='notice'>You start planting [src]. The timer is set to [det_time]...</span>")
 
 	if(do_after(user, 30, target = AM))
 		if(!user.temporarilyRemoveItemFromInventory(src))
@@ -126,7 +126,7 @@
 /obj/item/grenade/plastic/suicide_act(mob/user)
 	message_admins("[ADMIN_LOOKUPFLW(user)] suicided with [src] at [ADMIN_COORDJMP(user)]",0,1)
 	log_game("[key_name(user)] suicided with [src] at [COORD(user)]")
-	user.visible_message("<span class='suicide'>[user] activates the [src] and holds it above [user.p_their()] head! It looks like [user.p_theyre()] going out with a bang!</span>")
+	user.visible_message("<span class='suicide'>[user] activates [src] and holds it above [user.p_their()] head! It looks like [user.p_theyre()] going out with a bang!</span>")
 	var/message_say = "FOR NO RAISIN!"
 	if(user.mind)
 		if(user.mind.special_role)

code/game/objects/items/robot/robot_items.dm

@@ -274,17 +274,22 @@
 		to_chat(user, "<span class='notice'>You stop charging [target].</span>")
 
 /obj/item/device/harmalarm
+<<<<<<< HEAD
 	name = "Sonic Harm Prevention Tool"
 	desc = "Releases a harmless blast that confuses most organics. For when the harm is JUST TOO MUCH"
+=======
+	name = "\improper Sonic Harm Prevention Tool"
+	desc = "Releases a harmless blast that confuses most organics. For when the harm is JUST TOO MUCH."
+>>>>>>> 7998a3c... Merge pull request #31601 from AutomaticFrenzy/patch/thethe
 	icon_state = "megaphone"
 	var/cooldown = 0
 
 /obj/item/device/harmalarm/emag_act(mob/user)
 	emagged = !emagged
 	if(emagged)
-		to_chat(user, "<font color='red'>You short out the safeties on the [src]!</font>")
+		to_chat(user, "<font color='red'>You short out the safeties on [src]!</font>")
 	else
-		to_chat(user, "<font color='red'>You reset the safeties on the [src]!</font>")
+		to_chat(user, "<font color='red'>You reset the safeties on [src]!</font>")
 
 /obj/item/device/harmalarm/attack_self(mob/user)
 	var/safety = !emagged
@@ -503,9 +508,8 @@
 
 //Peacekeeper Cyborg Projectile Dampenening Field
 /obj/item/borg/projectile_dampen
-	name = "Hyperkinetic Dampening projector"
-	desc = "A device that projects a dampening field that weakenss kinetic energy above a certain threshold. <span class='boldnotice'>Projects a field that drains power per second \
-		while active, that will weaken and slow damaging projectiles inside its field.</span> Still being a prototype, it tends to induce a charge on ungrounded metallic surfaces."
+	name = "\improper Hyperkinetic Dampening projector"
+	desc = "A device that projects a dampening field that weakens kinetic energy above a certain threshold. <span class='boldnotice'>Projects a field that drains power per second while active, that will weaken and slow damaging projectiles inside its field.</span> Still being a prototype, it tends to induce a charge on ungrounded metallic surfaces."
 	icon = 'icons/obj/device.dmi'
 	icon_state = "shield"
 	var/maxenergy = 1500
@@ -544,7 +548,7 @@
 
 /obj/item/borg/projectile_dampen/attack_self(mob/user)
 	if(cycle_delay > world.time)
-		to_chat(user, "<span class='boldwarning'>\the [src] is still recycling its projectors!</span>")
+		to_chat(user, "<span class='boldwarning'>[src] is still recycling its projectors!</span>")
 		return
 	cycle_delay = world.time + PKBORG_DAMPEN_CYCLE_DELAY
 	active = !active
@@ -553,7 +557,7 @@
 	else
 		deactivate_field()
 	update_icon()
-	to_chat(user, "<span class='boldnotice'>You [active? "activate":"deactivate"] the [src].</span>")
+	to_chat(user, "<span class='boldnotice'>You [active? "activate":"deactivate"] [src].</span>")
 
 /obj/item/borg/projectile_dampen/update_icon()
 	icon_state = "[initial(icon_state)][active]"
@@ -601,7 +605,7 @@
 	energy = Clamp(energy - usage, 0, maxenergy)
 	if(energy <= 0)
 		deactivate_field()
-		visible_message("<span class='warning'>The [src] blinks \"ENERGY DEPLETED\"</span>")
+		visible_message("<span class='warning'>[src] blinks \"ENERGY DEPLETED\".</span>")
 
 /obj/item/borg/projectile_dampen/proc/process_recharge()
 	if(!istype(host))

code/game/objects/items/stacks/telecrystal.dm

@@ -23,15 +23,15 @@
 	if(isitem(I) && I.hidden_uplink && I.hidden_uplink.active) //No metagaming by using this on every PDA around just to see if it gets used up.
 		I.hidden_uplink.telecrystals += amount
 		use(amount)
-		to_chat(user, "<span class='notice'>You slot [src] into the [I] and charge its internal uplink.</span>")
+		to_chat(user, "<span class='notice'>You slot [src] into [I] and charge its internal uplink.</span>")
 	else if(istype(I, /obj/item/cartridge/virus/frame))
 		var/obj/item/cartridge/virus/frame/cart = I
 		if(!cart.charges)
-			to_chat(user, "<span class='notice'>The [cart] is out of charges, it's refusing to accept the [src]</span>")
+			to_chat(user, "<span class='notice'>[cart] is out of charges, it's refusing to accept [src].</span>")
 			return
 		cart.telecrystals += amount
 		use(amount)
-		to_chat(user, "<span class='notice'>You slot [src] into the [cart].  The next time it's used, it will also give telecrystals</span>")
+		to_chat(user, "<span class='notice'>You slot [src] into [cart].  The next time it's used, it will also give telecrystals.</span>")
 
 /obj/item/stack/telecrystal/five
 	amount = 5

code/game/objects/items/storage/boxes.dm

@@ -681,7 +681,7 @@
 	if(istype(W, /obj/item/pen))
 		//if a pen is used on the sack, dialogue to change its design appears
 		if(contents.len)
-			to_chat(user, "<span class='warning'>You can't modify this [src] with items still inside!</span>")
+			to_chat(user, "<span class='warning'>You can't modify [src] with items still inside!</span>")
 			return
 		var/list/designs = list(NODESIGN, NANOTRASEN, SYNDI, HEART, SMILE, "Cancel")
 		var/switchDesign = input("Select a Design:", "Paper Sack Design", designs[1]) in designs
@@ -691,7 +691,7 @@
 		var/choice = designs.Find(switchDesign)
 		if(design == designs[choice] || designs[choice] == "Cancel")
 			return 0
-		to_chat(usr, "<span class='notice'>You make some modifications to the [src] using your pen.</span>")
+		to_chat(usr, "<span class='notice'>You make some modifications to [src] using your pen.</span>")
 		design = designs[choice]
 		icon_state = "paperbag_[design]"
 		item_state = "paperbag_[design]"
@@ -710,12 +710,12 @@
 	else if(W.is_sharp())
 		if(!contents.len)
 			if(item_state == "paperbag_None")
-				user.show_message("<span class='notice'>You cut eyeholes into the [src].</span>", 1)
+				user.show_message("<span class='notice'>You cut eyeholes into [src].</span>", 1)
 				new /obj/item/clothing/head/papersack(user.loc)
 				qdel(src)
 				return 0
 			else if(item_state == "paperbag_SmileyFace")
-				user.show_message("<span class='notice'>You cut eyeholes into the [src] and modify the design.</span>", 1)
+				user.show_message("<span class='notice'>You cut eyeholes into [src] and modify the design.</span>", 1)
 				new /obj/item/clothing/head/papersack/smiley(user.loc)
 				qdel(src)
 				return 0

code/game/objects/items/teleportation.dm

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 
 #define SOURCE_PORTAL 1
 #define DESTINATION_PORTAL 2
@@ -220,3 +221,227 @@ Frequency:
 		if(active_portal_pairs[i] == P)
 			return DESTINATION_PORTAL
 	return FALSE
+=======
+
+#define SOURCE_PORTAL 1
+#define DESTINATION_PORTAL 2
+
+/* Teleportation devices.
+ * Contains:
+ *		Locator
+ *		Hand-tele
+ */
+
+/*
+ * Locator
+ */
+/obj/item/locator
+	name = "locator"
+	desc = "Used to track those with locater implants."
+	icon = 'icons/obj/device.dmi'
+	icon_state = "locator"
+	var/temp = null
+	var/frequency = 1451
+	var/broadcasting = null
+	var/listening = 1
+	flags_1 = CONDUCT_1
+	w_class = WEIGHT_CLASS_SMALL
+	item_state = "electronic"
+	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
+	throw_speed = 3
+	throw_range = 7
+	materials = list(MAT_METAL=400)
+	origin_tech = "magnets=3;bluespace=2"
+
+/obj/item/locator/attack_self(mob/user)
+	user.set_machine(src)
+	var/dat
+	if (src.temp)
+		dat = "[src.temp]<BR><BR><A href='byond://?src=\ref[src];temp=1'>Clear</A>"
+	else
+		dat = {"
+<B>Persistent Signal Locator</B><HR>
+Frequency:
+<A href='byond://?src=\ref[src];freq=-10'>-</A>
+<A href='byond://?src=\ref[src];freq=-2'>-</A> [format_frequency(src.frequency)]
+<A href='byond://?src=\ref[src];freq=2'>+</A>
+<A href='byond://?src=\ref[src];freq=10'>+</A><BR>
+
+<A href='?src=\ref[src];refresh=1'>Refresh</A>"}
+	user << browse(dat, "window=radio")
+	onclose(user, "radio")
+	return
+
+/obj/item/locator/Topic(href, href_list)
+	..()
+	if (usr.stat || usr.restrained())
+		return
+	var/turf/current_location = get_turf(usr)//What turf is the user on?
+	if(!current_location || current_location.z == ZLEVEL_CENTCOM)//If turf was not found or they're on CentCom
+		to_chat(usr, "[src] is malfunctioning.")
+		return
+	if(usr.contents.Find(src) || (in_range(src, usr) && isturf(loc)))
+		usr.set_machine(src)
+		if (href_list["refresh"])
+			src.temp = "<B>Persistent Signal Locator</B><HR>"
+			var/turf/sr = get_turf(src)
+
+			if (sr)
+				src.temp += "<B>Located Beacons:</B><BR>"
+
+				for(var/obj/item/device/radio/beacon/W in GLOB.teleportbeacons)
+					if (W.frequency == src.frequency)
+						var/turf/tr = get_turf(W)
+						if (tr.z == sr.z && tr)
+							var/direct = max(abs(tr.x - sr.x), abs(tr.y - sr.y))
+							if (direct < 5)
+								direct = "very strong"
+							else
+								if (direct < 10)
+									direct = "strong"
+								else
+									if (direct < 20)
+										direct = "weak"
+									else
+										direct = "very weak"
+							src.temp += "[W.code]-[dir2text(get_dir(sr, tr))]-[direct]<BR>"
+
+				src.temp += "<B>Extranneous Signals:</B><BR>"
+				for (var/obj/item/implant/tracking/W in GLOB.tracked_implants)
+					if (!W.imp_in || !ismob(W.loc))
+						continue
+					else
+						var/mob/M = W.loc
+						if (M.stat == DEAD)
+							if (M.timeofdeath + 6000 < world.time)
+								continue
+
+					var/turf/tr = get_turf(W)
+					if (tr.z == sr.z && tr)
+						var/direct = max(abs(tr.x - sr.x), abs(tr.y - sr.y))
+						if (direct < 20)
+							if (direct < 5)
+								direct = "very strong"
+							else
+								if (direct < 10)
+									direct = "strong"
+								else
+									direct = "weak"
+							src.temp += "[W.imp_in.name]-[dir2text(get_dir(sr, tr))]-[direct]<BR>"
+
+				src.temp += "<B>You are at \[[sr.x],[sr.y],[sr.z]\]</B> in orbital coordinates.<BR><BR><A href='byond://?src=\ref[src];refresh=1'>Refresh</A><BR>"
+			else
+				src.temp += "<B><FONT color='red'>Processing Error:</FONT></B> Unable to locate orbital position.<BR>"
+		else
+			if (href_list["freq"])
+				src.frequency += text2num(href_list["freq"])
+				src.frequency = sanitize_frequency(src.frequency)
+			else
+				if (href_list["temp"])
+					src.temp = null
+		if (ismob(src.loc))
+			attack_self(src.loc)
+		else
+			for(var/mob/M in viewers(1, src))
+				if (M.client)
+					src.attack_self(M)
+	return
+
+
+/*
+ * Hand-tele
+ */
+/obj/item/hand_tele
+	name = "hand tele"
+	desc = "A portable item using blue-space technology."
+	icon = 'icons/obj/device.dmi'
+	icon_state = "hand_tele"
+	item_state = "electronic"
+	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
+	throwforce = 0
+	w_class = WEIGHT_CLASS_SMALL
+	throw_speed = 3
+	throw_range = 5
+	materials = list(MAT_METAL=10000)
+	origin_tech = "magnets=3;bluespace=4"
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 30, bio = 0, rad = 0, fire = 100, acid = 100)
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
+	var/list/active_portal_pairs
+	var/max_portal_pairs = 3
+
+/obj/item/hand_tele/Initialize()
+	. = ..()
+	active_portal_pairs = list()
+
+/obj/item/hand_tele/afterattack(atom/target, mob/user, proximity, params)
+	if(is_parent_of_portal(target))
+		qdel(target)
+		to_chat(user, "<span class='notice'>You dispel [target] remotely with \the [src]!</span>")
+	return ..()
+
+
+/obj/item/hand_tele/attack_self(mob/user)
+	var/turf/current_location = get_turf(user)//What turf is the user on?
+	var/area/current_area = current_location.loc
+	if(!current_location || current_area.noteleport || current_location.z > ZLEVEL_SPACEMAX || !isturf(user.loc))//If turf was not found or they're on z level 2 or >7 which does not currently exist. or if user is not located on a turf
+		to_chat(user, "<span class='notice'>\The [src] is malfunctioning.</span>")
+		return
+	var/list/L = list(  )
+	for(var/obj/machinery/computer/teleporter/com in GLOB.machines)
+		if(com.target)
+			var/area/A = get_area(com.target)
+			if(!A || A.noteleport)
+				continue
+			if(com.power_station && com.power_station.teleporter_hub && com.power_station.engaged)
+				L["[get_area(com.target)] (Active)"] = com.target
+			else
+				L["[get_area(com.target)] (Inactive)"] = com.target
+	var/list/turfs = list(	)
+	for(var/turf/T in urange(10, orange=1))
+		if(T.x>world.maxx-8 || T.x<8)
+			continue	//putting them at the edge is dumb
+		if(T.y>world.maxy-8 || T.y<8)
+			continue
+		var/area/A = T.loc
+		if(A.noteleport)
+			continue
+		turfs += T
+	if(turfs.len)
+		L["None (Dangerous)"] = pick(turfs)
+	var/t1 = input(user, "Please select a teleporter to lock in on.", "Hand Teleporter") as null|anything in L
+	if (!t1 || user.get_active_held_item() != src || user.incapacitated())
+		return
+	if(active_portal_pairs.len >= max_portal_pairs)
+		user.show_message("<span class='notice'>\The [src] is recharging!</span>")
+		return
+	var/atom/T = L[t1]
+	var/area/A = get_area(T)
+	if(A.noteleport)
+		to_chat(user, "<span class='notice'>\The [src] is malfunctioning.</span>")
+		return
+	user.show_message("<span class='notice'>Locked In.</span>", 2)
+	var/list/obj/effect/portal/created = create_portal_pair(current_location, get_teleport_turf(get_turf(T)), src, 300, 1)
+	if(!(LAZYLEN(created) == 2))
+		return
+	try_move_adjacent(created[1])
+	active_portal_pairs[created[1]] = created[2]
+	var/obj/effect/portal/c1 = created[1]
+	var/obj/effect/portal/c2 = created[2]
+	investigate_log("was used by [key_name(user)] at [COORD(user)] to create a portal pair with destinations [COORD(c1)] and [COORD(c2)].", INVESTIGATE_PORTAL)
+	add_fingerprint(user)
+
+/obj/item/hand_tele/proc/on_portal_destroy(obj/effect/portal/P)
+	active_portal_pairs -= P	//If this portal pair is made by us it'll be erased along with the other portal by the portal.
+
+/obj/item/hand_tele/proc/is_parent_of_portal(obj/effect/portal/P)
+	if(!istype(P))
+		return FALSE
+	if(active_portal_pairs[P])
+		return SOURCE_PORTAL
+	for(var/i in active_portal_pairs)
+		if(active_portal_pairs[i] == P)
+			return DESTINATION_PORTAL
+	return FALSE
+>>>>>>> 7998a3c... Merge pull request #31601 from AutomaticFrenzy/patch/thethe

code/game/objects/items/toys.dm

@@ -1105,7 +1105,7 @@
 /obj/item/toy/figure/attack_self(mob/user as mob)
 	if(cooldown <= world.time)
 		cooldown = world.time + 50
-		to_chat(user, "<span class='notice'>The [src] says \"[toysay]\"</span>")
+		to_chat(user, "<span class='notice'>[src] says \"[toysay]\"</span>")
 		playsound(user, toysound, 20, 1)
 
 /obj/item/toy/figure/cmo

code/game/objects/structures.dm

@@ -31,7 +31,7 @@
 		user.changeNext_move(CLICK_CD_MELEE)
 		user.do_attack_animation(src)
 		structureclimber.Knockdown(40)
-		structureclimber.visible_message("<span class='warning'>[structureclimber.name] has been knocked off the [src]", "You're knocked off the [src]!", "You see [structureclimber.name] get knocked off the [src]</span>")
+		structureclimber.visible_message("<span class='warning'>[structureclimber] has been knocked off [src].", "You're knocked off [src]!", "You see [structureclimber] get knocked off [src].</span>")
 	interact(user)
 
 /obj/structure/interact(mob/user)

code/game/objects/structures/displaycase.dm

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 /obj/structure/displaycase
 	name = "display case"
 	icon = 'icons/obj/stationobjs.dmi'
@@ -360,3 +361,367 @@
 	name = initial(I.name)
 	icon = initial(I.icon)
 	icon_state = initial(I.icon_state)
+=======
+/obj/structure/displaycase
+	name = "display case"
+	icon = 'icons/obj/stationobjs.dmi'
+	icon_state = "glassbox0"
+	desc = "A display case for prized possessions."
+	density = TRUE
+	anchored = TRUE
+	resistance_flags = ACID_PROOF
+	armor = list(melee = 30, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 0, rad = 0, fire = 70, acid = 100)
+	max_integrity = 200
+	integrity_failure = 50
+	var/obj/item/showpiece = null
+	var/alert = TRUE
+	var/open = FALSE
+	var/openable = TRUE
+	var/obj/item/electronics/airlock/electronics
+	var/start_showpiece_type = null //add type for items on display
+
+/obj/structure/displaycase/Initialize()
+	. = ..()
+	if(start_showpiece_type)
+		showpiece = new start_showpiece_type (src)
+	update_icon()
+
+/obj/structure/displaycase/Destroy()
+	if(electronics)
+		QDEL_NULL(electronics)
+	if(showpiece)
+		QDEL_NULL(showpiece)
+	return ..()
+
+/obj/structure/displaycase/examine(mob/user)
+	..()
+	if(alert)
+		to_chat(user, "<span class='notice'>Hooked up with an anti-theft system.</span>")
+	if(showpiece)
+		to_chat(user, "<span class='notice'>There's [showpiece] inside.</span>")
+
+
+/obj/structure/displaycase/proc/dump()
+	if (showpiece)
+		showpiece.forceMove(loc)
+		showpiece = null
+
+/obj/structure/displaycase/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
+	switch(damage_type)
+		if(BRUTE)
+			playsound(src.loc, 'sound/effects/glasshit.ogg', 75, 1)
+		if(BURN)
+			playsound(src.loc, 'sound/items/welder.ogg', 100, 1)
+
+/obj/structure/displaycase/deconstruct(disassembled = TRUE)
+	if(!(flags_1 & NODECONSTRUCT_1))
+		dump()
+		if(!disassembled)
+			new /obj/item/shard( src.loc )
+			trigger_alarm()
+	qdel(src)
+
+/obj/structure/displaycase/obj_break(damage_flag)
+	if(!broken && !(flags_1 & NODECONSTRUCT_1))
+		density = FALSE
+		broken = 1
+		new /obj/item/shard( src.loc )
+		playsound(src, "shatter", 70, 1)
+		update_icon()
+		trigger_alarm()
+
+/obj/structure/displaycase/proc/trigger_alarm()
+	//Activate Anti-theft
+	if(alert)
+		var/area/alarmed = get_area(src)
+		alarmed.burglaralert(src)
+		playsound(src, 'sound/effects/alert.ogg', 50, 1)
+
+/*
+
+*/
+
+/obj/structure/displaycase/proc/is_directional(atom/A)
+	try
+		getFlatIcon(A,defdir=4)
+	catch
+		return 0
+	return 1
+
+/obj/structure/displaycase/proc/get_flat_icon_directional(atom/A)
+	//Get flatIcon even if dir is mismatched for directionless icons
+	//SLOW
+	var/icon/I
+	if(is_directional(A))
+		I = getFlatIcon(A)
+	else
+		var/old_dir = A.dir
+		A.setDir(2)
+		I = getFlatIcon(A)
+		A.setDir(old_dir)
+	return I
+
+/obj/structure/displaycase/update_icon()
+	var/icon/I
+	if(open)
+		I = icon('icons/obj/stationobjs.dmi',"glassbox_open")
+	else
+		I = icon('icons/obj/stationobjs.dmi',"glassbox0")
+	if(broken)
+		I = icon('icons/obj/stationobjs.dmi',"glassboxb0")
+	if(showpiece)
+		var/icon/S = get_flat_icon_directional(showpiece)
+		S.Scale(17,17)
+		I.Blend(S,ICON_UNDERLAY,8,8)
+	src.icon = I
+	return
+
+/obj/structure/displaycase/attackby(obj/item/W, mob/user, params)
+	if(W.GetID() && !broken && openable)
+		if(allowed(user))
+			to_chat(user,  "<span class='notice'>You [open ? "close":"open"] [src].</span>")
+			toggle_lock(user)
+		else
+			to_chat(user,  "<span class='warning'>Access denied.</span>")
+	else if(istype(W, /obj/item/weldingtool) && user.a_intent == INTENT_HELP && !broken)
+		var/obj/item/weldingtool/WT = W
+		if(obj_integrity < max_integrity && WT.remove_fuel(5, user))
+			to_chat(user, "<span class='notice'>You begin repairing [src].</span>")
+			playsound(loc, WT.usesound, 40, 1)
+			if(do_after(user, 40*W.toolspeed, target = src))
+				obj_integrity = max_integrity
+				playsound(loc, 'sound/items/welder2.ogg', 50, 1)
+				update_icon()
+				to_chat(user, "<span class='notice'>You repair [src].</span>")
+		else
+			to_chat(user, "<span class='warning'>[src] is already in good condition!</span>")
+		return
+	else if(!alert && istype(W, /obj/item/crowbar) && openable) //Only applies to the lab cage and player made display cases
+		if(broken)
+			if(showpiece)
+				to_chat(user, "<span class='notice'>Remove the displayed object first.</span>")
+			else
+				to_chat(user, "<span class='notice'>You remove the destroyed case</span>")
+				qdel(src)
+		else
+			to_chat(user, "<span class='notice'>You start to [open ? "close":"open"] [src].</span>")
+			if(do_after(user, 20*W.toolspeed, target = src))
+				to_chat(user,  "<span class='notice'>You [open ? "close":"open"] [src].</span>")
+				toggle_lock(user)
+	else if(open && !showpiece)
+		if(user.transferItemToLoc(W, src))
+			showpiece = W
+			to_chat(user, "<span class='notice'>You put [W] on display</span>")
+			update_icon()
+	else if(istype(W, /obj/item/stack/sheet/glass) && broken)
+		var/obj/item/stack/sheet/glass/G = W
+		if(G.get_amount() < 2)
+			to_chat(user, "<span class='warning'>You need two glass sheets to fix the case!</span>")
+			return
+		to_chat(user, "<span class='notice'>You start fixing [src]...</span>")
+		if(do_after(user, 20, target = src))
+			G.use(2)
+			broken = 0
+			obj_integrity = max_integrity
+			update_icon()
+	else
+		return ..()
+
+/obj/structure/displaycase/proc/toggle_lock(mob/user)
+	open = !open
+	update_icon()
+
+/obj/structure/displaycase/attack_paw(mob/user)
+	return src.attack_hand(user)
+
+/obj/structure/displaycase/attack_hand(mob/user)
+	user.changeNext_move(CLICK_CD_MELEE)
+	if (showpiece && (broken || open))
+		to_chat(user, "<span class='notice'>You deactivate the hover field built into the case.</span>")
+		dump()
+		src.add_fingerprint(user)
+		update_icon()
+		return
+	else
+	    //prevents remote "kicks" with TK
+		if (!Adjacent(user))
+			return
+		user.visible_message("<span class='danger'>[user] kicks the display case.</span>", null, null, COMBAT_MESSAGE_RANGE)
+		user.do_attack_animation(src, ATTACK_EFFECT_KICK)
+		take_damage(2)
+
+
+
+/obj/structure/displaycase_chassis
+	anchored = TRUE
+	density = FALSE
+	name = "display case chassis"
+	desc = "The wooden base of a display case."
+	icon = 'icons/obj/stationobjs.dmi'
+	icon_state = "glassbox_chassis"
+	var/obj/item/electronics/airlock/electronics
+
+
+/obj/structure/displaycase_chassis/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/wrench)) //The player can only deconstruct the wooden frame
+		to_chat(user, "<span class='notice'>You start disassembling [src]...</span>")
+		playsound(src.loc, I.usesound, 50, 1)
+		if(do_after(user, 30*I.toolspeed, target = src))
+			playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1)
+			new /obj/item/stack/sheet/mineral/wood(get_turf(src), 5)
+			qdel(src)
+
+	else if(istype(I, /obj/item/electronics/airlock))
+		to_chat(user, "<span class='notice'>You start installing the electronics into [src]...</span>")
+		playsound(src.loc, I.usesound, 50, 1)
+		if(do_after(user, 30, target = src) && user.transferItemToLoc(I,src))
+			electronics = I
+			to_chat(user, "<span class='notice'>You install the airlock electronics.</span>")
+
+	else if(istype(I, /obj/item/stack/sheet/glass))
+		var/obj/item/stack/sheet/glass/G = I
+		if(G.get_amount() < 10)
+			to_chat(user, "<span class='warning'>You need ten glass sheets to do this!</span>")
+			return
+		to_chat(user, "<span class='notice'>You start adding [G] to [src]...</span>")
+		if(do_after(user, 20, target = src))
+			G.use(10)
+			var/obj/structure/displaycase/display = new(src.loc)
+			if(electronics)
+				electronics.loc = display
+				display.electronics = electronics
+				if(electronics.one_access)
+					display.req_one_access = electronics.accesses
+				else
+					display.req_access = electronics.accesses
+			qdel(src)
+	else
+		return ..()
+
+//The captains display case requiring specops ID access is intentional.
+//The lab cage and captains display case do not spawn with electronics, which is why req_access is needed.
+/obj/structure/displaycase/captain
+	alert = 1
+	start_showpiece_type = /obj/item/gun/energy/laser/captain
+	req_access = list(ACCESS_CENT_SPECOPS)
+
+/obj/structure/displaycase/labcage
+	name = "lab cage"
+	desc = "A glass lab container for storing interesting creatures."
+	start_showpiece_type = /obj/item/clothing/mask/facehugger/lamarr
+	req_access = list(ACCESS_RD)
+
+
+
+/obj/structure/displaycase/trophy
+	name = "trophy display case"
+	desc = "Store your trophies of accomplishment in here, and they will stay forever."
+	var/trophy_message = ""
+	var/placer_key = ""
+	var/added_roundstart = TRUE
+	var/is_locked = TRUE
+
+	alert = TRUE
+	integrity_failure = 0
+	openable = FALSE
+
+/obj/structure/displaycase/trophy/Initialize()
+	. = ..()
+	GLOB.trophy_cases += src
+
+/obj/structure/displaycase/trophy/Destroy()
+	GLOB.trophy_cases -= src
+	return ..()
+
+/obj/structure/displaycase/trophy/examine(mob/user)
+	..()
+	if(trophy_message)
+		to_chat(user, "The plaque reads:")
+		to_chat(user, trophy_message)
+
+/obj/structure/displaycase/trophy/attackby(obj/item/W, mob/user, params)
+
+	if(!user.Adjacent(src)) //no TK museology
+		return
+	if(user.a_intent == INTENT_HARM)
+		return ..()
+
+	if(user.is_holding_item_of_type(/obj/item/key/displaycase))
+		if(added_roundstart)
+			is_locked = !is_locked
+			to_chat(user, "You [!is_locked ? "un" : ""]lock the case.")
+		else
+			to_chat(user, "<span class='danger'>The lock is stuck shut!</span>")
+		return
+
+	if(is_locked)
+		to_chat(user, "<span class='danger'>The case is shut tight with an old fashioned physical lock. Maybe you should ask the curator for the key?</span>")
+		return
+
+	if(!added_roundstart)
+		to_chat(user, "You've already put something new in this case.")
+		return
+
+	if(is_type_in_typecache(W, GLOB.blacklisted_cargo_types))
+		to_chat(user, "<span class='danger'>The case rejects the [W].</span>")
+		return
+
+	for(var/a in W.GetAllContents())
+		if(is_type_in_typecache(a, GLOB.blacklisted_cargo_types))
+			to_chat(user, "<span class='danger'>The case rejects the [W].</span>")
+			return
+
+	if(user.transferItemToLoc(W, src))
+
+		if(showpiece)
+			to_chat(user, "You press a button, and [showpiece] descends into the floor of the case.")
+			QDEL_NULL(showpiece)
+
+		to_chat(user, "You insert [W] into the case.")
+		showpiece = W
+		added_roundstart = FALSE
+		update_icon()
+
+		placer_key = user.ckey
+
+		trophy_message = W.desc //default value
+
+		var/chosen_plaque = stripped_input(user, "What would you like the plaque to say? Default value is item's description.", "Trophy Plaque")
+		if(chosen_plaque)
+			if(user.Adjacent(src))
+				trophy_message = chosen_plaque
+				to_chat(user, "You set the plaque's text.")
+			else
+				to_chat(user, "You are too far to set the plaque's text.")
+
+		SSpersistence.SaveTrophy(src)
+		return TRUE
+
+	else
+		to_chat(user, "<span class='warning'>\The [W] is stuck to your hand, you can't put it in the [src.name]!</span>")
+
+	return
+
+/obj/structure/displaycase/trophy/dump()
+	if (showpiece)
+		if(added_roundstart)
+			visible_message("<span class='danger'>The [showpiece] crumbles to dust!</span>")
+			new /obj/effect/decal/cleanable/ash(loc)
+			QDEL_NULL(showpiece)
+		else
+			..()
+
+/obj/item/key/displaycase
+	name = "display case key"
+	desc = "The key to the curator's display cases."
+
+/obj/item/showpiece_dummy
+	name = "Cheap replica"
+
+/obj/item/showpiece_dummy/Initialize(mapload, path)
+	. = ..()
+	var/obj/item/I = path
+	name = initial(I.name)
+	icon = initial(I.icon)
+	icon_state = initial(I.icon_state)
+>>>>>>> 7998a3c... Merge pull request #31601 from AutomaticFrenzy/patch/thethe

code/game/objects/structures/hivebot.dm

@@ -5,6 +5,7 @@
 	icon_state = "def_radar-off"
 	anchored = TRUE
 	density = TRUE
+<<<<<<< HEAD
 	var/bot_type = "norm"
 	var/bot_amt = 10
 
@@ -34,3 +35,34 @@
 	playsound(src.loc, 'sound/effects/empulse.ogg', 25, 1)
 	qdel(src)
 	return
+=======
+	var/bot_type = "norm"
+	var/bot_amt = 10
+
+/obj/structure/hivebot_beacon/New()
+	..()
+	var/datum/effect_system/smoke_spread/smoke = new
+	smoke.set_up(2, loc)
+	smoke.start()
+	visible_message("<span class='boldannounce'>[src] warps in!</span>")
+	playsound(src.loc, 'sound/effects/empulse.ogg', 25, 1)
+	addtimer(CALLBACK(src, .proc/warpbots), rand(10, 600))
+
+/obj/structure/hivebot_beacon/proc/warpbots()
+	icon_state = "def_radar"
+	visible_message("<span class='danger'>[src] turns on!</span>")
+	while(bot_amt > 0)
+		bot_amt--
+		switch(bot_type)
+			if("norm")
+				new /mob/living/simple_animal/hostile/hivebot(get_turf(src))
+			if("range")
+				new /mob/living/simple_animal/hostile/hivebot/range(get_turf(src))
+			if("rapid")
+				new /mob/living/simple_animal/hostile/hivebot/rapid(get_turf(src))
+	sleep(100)
+	visible_message("<span class='boldannounce'>[src] warps out!</span>")
+	playsound(src.loc, 'sound/effects/empulse.ogg', 25, 1)
+	qdel(src)
+	return
+>>>>>>> 7998a3c... Merge pull request #31601 from AutomaticFrenzy/patch/thethe

code/game/objects/structures/kitchen_spike.dm

@@ -48,6 +48,7 @@
 	desc = "A spike for collecting meat from animals"
 	density = TRUE
 	anchored = TRUE
+<<<<<<< HEAD
 	buckle_lying = 0
 	can_buckle = 1
 	max_integrity = 250
@@ -149,3 +150,106 @@
 	qdel(src)
 
 #undef VIABLE_MOB_CHECK
+=======
+	buckle_lying = 0
+	can_buckle = 1
+	max_integrity = 250
+
+
+/obj/structure/kitchenspike/attack_paw(mob/user)
+	return src.attack_hand(usr)
+
+
+/obj/structure/kitchenspike/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/crowbar))
+		if(!has_buckled_mobs())
+			playsound(loc, I.usesound, 100, 1)
+			if(do_after(user, 20*I.toolspeed, target = src))
+				to_chat(user, "<span class='notice'>You pry the spikes out of the frame.</span>")
+				deconstruct(TRUE)
+		else
+			to_chat(user, "<span class='notice'>You can't do that while something's on the spike!</span>")
+	else
+		return ..()
+
+/obj/structure/kitchenspike/attack_hand(mob/user)
+	if(VIABLE_MOB_CHECK(user.pulling) && user.a_intent == INTENT_GRAB && !has_buckled_mobs())
+		var/mob/living/L = user.pulling
+		if(do_mob(user, src, 120))
+			if(has_buckled_mobs()) //to prevent spam/queing up attacks
+				return
+			if(L.buckled)
+				return
+			if(user.pulling != L)
+				return
+			playsound(src.loc, 'sound/effects/splat.ogg', 25, 1)
+			L.visible_message("<span class='danger'>[user] slams [L] onto the meat spike!</span>", "<span class='userdanger'>[user] slams you onto the meat spike!</span>", "<span class='italics'>You hear a squishy wet noise.</span>")
+			L.loc = src.loc
+			L.emote("scream")
+			L.add_splatter_floor()
+			L.adjustBruteLoss(30)
+			L.setDir(2)
+			buckle_mob(L, force=1)
+			var/matrix/m180 = matrix(L.transform)
+			m180.Turn(180)
+			animate(L, transform = m180, time = 3)
+			L.pixel_y = L.get_standard_pixel_y_offset(180)
+	else if (has_buckled_mobs())
+		for(var/mob/living/L in buckled_mobs)
+			user_unbuckle_mob(L, user)
+	else
+		..()
+
+
+
+/obj/structure/kitchenspike/user_buckle_mob(mob/living/M, mob/living/user) //Don't want them getting put on the rack other than by spiking
+	return
+
+/obj/structure/kitchenspike/user_unbuckle_mob(mob/living/buckled_mob, mob/living/carbon/human/user)
+	if(buckled_mob)
+		var/mob/living/M = buckled_mob
+		if(M != user)
+			M.visible_message(\
+				"[user] tries to pull [M] free of [src]!",\
+				"<span class='notice'>[user] is trying to pull you off [src], opening up fresh wounds!</span>",\
+				"<span class='italics'>You hear a squishy wet noise.</span>")
+			if(!do_after(user, 300, target = src))
+				if(M && M.buckled)
+					M.visible_message(\
+					"[user] fails to free [M]!",\
+					"<span class='notice'>[user] fails to pull you off of [src].</span>")
+				return
+
+		else
+			M.visible_message(\
+			"<span class='warning'>[M] struggles to break free from [src]!</span>",\
+			"<span class='notice'>You struggle to break free from [src], exacerbating your wounds! (Stay still for two minutes.)</span>",\
+			"<span class='italics'>You hear a wet squishing noise..</span>")
+			M.adjustBruteLoss(30)
+			if(!do_after(M, 1200, target = src))
+				if(M && M.buckled)
+					to_chat(M, "<span class='warning'>You fail to free yourself!</span>")
+				return
+		if(!M.buckled)
+			return
+		var/matrix/m180 = matrix(M.transform)
+		m180.Turn(180)
+		animate(M, transform = m180, time = 3)
+		M.pixel_y = M.get_standard_pixel_y_offset(180)
+		M.adjustBruteLoss(30)
+		src.visible_message(text("<span class='danger'>[M] falls free of [src]!</span>"))
+		unbuckle_mob(M,force=1)
+		M.emote("scream")
+		M.AdjustKnockdown(20)
+
+/obj/structure/kitchenspike/deconstruct(disassembled = TRUE)
+	if(disassembled)
+		var/obj/F = new /obj/structure/kitchenspike_frame(src.loc)
+		transfer_fingerprints_to(F)
+	else
+		new /obj/item/stack/sheet/metal(src.loc, 4)
+	new /obj/item/stack/rods(loc, 4)
+	qdel(src)
+
+#undef VIABLE_MOB_CHECK
+>>>>>>> 7998a3c... Merge pull request #31601 from AutomaticFrenzy/patch/thethe

code/game/objects/structures/reflector.dm

@@ -47,10 +47,10 @@
 		return
 	if(istype(W, /obj/item/wrench))
 		if(anchored)
-			to_chat(user, "Unweld the [src] first!")
+			to_chat(user, "Unweld [src] first!")
 		if(do_after(user, 80*W.toolspeed, target = src))
 			playsound(src.loc, W.usesound, 50, 1)
-			to_chat(user, "You dismantle the [src].")
+			to_chat(user, "You dismantle [src].")
 			new framebuildstacktype(loc, framebuildstackamount)
 			new buildstacktype(loc, buildstackamount)
 			qdel(src)
@@ -60,7 +60,7 @@
 			if(0)
 				if (WT.remove_fuel(0,user))
 					playsound(src.loc, 'sound/items/welder2.ogg', 50, 1)
-					user.visible_message("[user.name] starts to weld the [src.name] to the floor.", \
+					user.visible_message("[user.name] starts to weld [src] to the floor.", \
 						"<span class='notice'>You start to weld \the [src] to the floor...</span>", \
 						"<span class='italics'>You hear welding.</span>")
 					if (do_after(user,20*W.toolspeed, target = src))
@@ -71,7 +71,7 @@
 			if(1)
 				if (WT.remove_fuel(0,user))
 					playsound(src.loc, 'sound/items/welder2.ogg', 50, 1)
-					user.visible_message("[user.name] starts to cut the [src.name] free from the floor.", \
+					user.visible_message("[user.name] starts to cut [src] free from the floor.", \
 						"<span class='notice'>You start to cut \the [src] free from the floor...</span>", \
 						"<span class='italics'>You hear welding.</span>")
 					if (do_after(user,20*W.toolspeed, target = src))