Fix many instances of "the the"

2017-10-13 10:40:52 -04:00
parent 692e226d24
commit bd7a0d65b5
60 changed files with 869 additions and 135 deletions
@@ -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