Fix many instances of "the the"

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))