From 394657256caca8c4022f57eff19b0c133ca21497 Mon Sep 17 00:00:00 2001
From: SamCroswell <Sam.Croswell@gmail.com>
Date: Mon, 21 Mar 2016 00:25:31 -0400
Subject: [PATCH 1/3] Traitor Garrote, Initial Commit

---
 code/game/objects/items/weapons/garrote.dm | 120 +++++++++++++++++++++
 icons/obj/weapons.dmi                      | Bin 46516 -> 46891 bytes
 paradise.dme                               |   1 +
 3 files changed, 121 insertions(+)
 create mode 100644 code/game/objects/items/weapons/garrote.dm

diff --git a/code/game/objects/items/weapons/garrote.dm b/code/game/objects/items/weapons/garrote.dm
new file mode 100644
index 00000000000..bfd76ed0f97
--- /dev/null
+++ b/code/game/objects/items/weapons/garrote.dm
@@ -0,0 +1,120 @@
+/obj/item/weapon/twohanded/garrote
+	name = "fiber wire"
+	desc = "A length of razor-thin wire with a wooden handle on either end.<br>You suspect you'd have to be behind the target to use this weapon effectively."
+	icon_state = "garrot_wrap"
+	w_class = 1
+	var/mob/living/carbon/human/strangling
+
+/obj/item/weapon/twohanded/garrote/update_icon()
+	if(strangling) // If we're strangling someone we want our icon to stay wielded
+		icon_state = "garrot_unwrap"
+		return
+
+	icon_state = "garrot_[wielded ? "un" : ""]wrap"
+
+/obj/item/weapon/twohanded/garrote/wield(mob/living/carbon/user)
+	if(strangling)
+		user.visible_message("<span class='warning'>[user] removes the [src] from [strangling]'s neck.</span>", \
+				"<span class='warning'>You remove the [src] from [strangling]'s neck.</span>")
+
+		strangling = null
+		update_icon()
+		processing_objects.Remove(src)
+
+	else
+		..()
+
+/obj/item/weapon/twohanded/garrote/attack(mob/living/carbon/M as mob, mob/user as mob)
+	if(!wielded)
+		user << "<span class = 'warning'>You must use both hands to garrote [M]!</span>"
+		return
+
+	if(!istype(M, /mob/living/carbon/human))
+		user << "<span class = 'warning'>You don't think that garroting [M] would be very effective...</span>"
+		return
+
+	if(M == user)
+		user << "<span class = 'info'>You decide against strangling yourself for the time being.</span>"
+
+	if(M.dir != user.dir)
+		user << "<span class='warning'>You cannot use [src] on [M] from that angle!</span>"
+		return
+
+	if(strangling)
+		user << "<span class = 'warning'>You cannot use [src] on two people at once!</span>"
+		return
+
+	unwield(user)
+
+	if(!istype(user, /mob/living/carbon/human)) // spap_hand is a proc of /mob/living, user is simply /mob
+		return
+	var/mob/living/carbon/human/U = user
+
+	U.swap_hand() // For whatever reason the grab will not properly work if we don't have the free hand active.
+	M.grabbedby(U, 1)
+	var/obj/item/weapon/grab/G = U.get_active_hand()
+	U.swap_hand()
+
+	if(G && istype(G))
+		G.state = GRAB_NECK
+		G.hud.icon_state = "kill"
+		G.hud.name = "kill"
+
+	processing_objects.Add(src)
+	strangling = M
+	update_icon()
+
+	playsound(src.loc, 'sound/weapons/cablecuff.ogg', 15, 1, -1)
+
+	M.visible_message("<span class='danger'>[user] comes from behind and begins garroting [M] with the [src]!</span>", \
+				  "<span class='userdanger'>[user]\ begins garroting you with the [src]! You are unable to speak!</span>", \
+				  "You hear struggling and wire strain against flesh!")
+
+	return
+
+/obj/item/weapon/twohanded/garrote/process()
+
+	if(!istype(loc, /mob/living/carbon/human))
+		strangling = null
+		update_icon()
+		processing_objects.Remove(src)
+		return
+
+	var/mob/living/carbon/human/user = loc
+	var/mob/living/carbon/human/target = strangling
+	var/obj/item/weapon/grab/G
+
+	if(src == user.r_hand && istype(user.l_hand, /obj/item/weapon/grab))
+		G = user.l_hand
+
+	else if(src == user.l_hand && istype(user.r_hand, /obj/item/weapon/grab))
+		G = user.r_hand
+
+	else
+		user.visible_message("<span class='warning'>[user] loses his grip on [target]'s neck.</span>", \
+				 "<span class='warning'>You lose your grip on [target]'s neck.</span>")
+
+		strangling = null
+		update_icon()
+		processing_objects.Remove(src)
+
+		return
+
+	if(!G.affecting)
+		user.visible_message("<span class='warning'>[user] loses his grip on [target]'s neck.</span>", \
+				"<span class='warning'>You lose your grip on [target]'s neck.</span>")
+
+		strangling = null
+		update_icon()
+		processing_objects.Remove(src)
+
+		return
+
+	strangling.silent += 1
+	strangling.adjustOxyLoss(2)
+	strangling.apply_damage(2, BRUTE, "head", sharp = 1, edge = 1, used_weapon = "Razor Wire") // Razor sharp wire, causes bleeding in the neck but only if the head is unarmored.
+
+/obj/item/weapon/twohanded/garrote/suicide_act(mob/user)
+	user.visible_message("<span class='suicide'>[user] is wrapping the [src] around \his neck and pulling the handles! It looks like \he's trying to commit suicide.</span>")
+	playsound(src.loc, 'sound/weapons/cablecuff.ogg', 15, 1, -1)
+	return (OXYLOSS)
\ No newline at end of file
diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi
index 892dfe2a64e9b8b57fc1aa3f31f45ce61b6f3531..e56f92a7cc1f824b04ed9774221e1e4676680f87 100644
GIT binary patch
delta 5114
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

delta 4736
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
O0000<MNUMnLSTX{-84=B

diff --git a/paradise.dme b/paradise.dme
index a05cd77e6f4..3ba1487e797 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -725,6 +725,7 @@
 #include "code\game\objects\items\weapons\extinguisher.dm"
 #include "code\game\objects\items\weapons\fireworks.dm"
 #include "code\game\objects\items\weapons\flamethrower.dm"
+#include "code\game\objects\items\weapons\garrote.dm"
 #include "code\game\objects\items\weapons\gift_wrappaper.dm"
 #include "code\game\objects\items\weapons\handcuffs.dm"
 #include "code\game\objects\items\weapons\holosign.dm"

From f983245c3f6d7bd9ab2dd5e0c0956f6fa3f0c951 Mon Sep 17 00:00:00 2001
From: SamCroswell <Sam.Croswell@gmail.com>
Date: Mon, 21 Mar 2016 20:31:55 -0400
Subject: [PATCH 2/3] Garrotes, Commit 2

---
 code/datums/uplink_item.dm                 |   8 ++
 code/game/objects/items/weapons/garrote.dm |  90 +++++++++++++++------
 code/modules/crafting/recipes.dm           |  10 ++-
 icons/obj/weapons.dmi                      | Bin 46891 -> 47616 bytes
 4 files changed, 83 insertions(+), 25 deletions(-)

diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm
index 803c1c0399d..9471954e314 100644
--- a/code/datums/uplink_item.dm
+++ b/code/datums/uplink_item.dm
@@ -518,6 +518,14 @@ var/list/uplink_items = list()
 /datum/uplink_item/stealthy_weapons
 	category = "Stealthy and Inconspicuous Weapons"
 
+/datum/uplink_item/stealthy_weapons/garrote
+	name = "Fiber Wire Garrote"
+	desc = "A length of fiber wire between two wooden handles, perfect for the discrete assassin. This weapon, when used on a target from behind \
+			will instantly put them in your grasp and silence them, as well as causing rapid suffocation. Does not work on those who do not need to breathe."
+	reference = "GAR"
+	item = /obj/item/weapon/twohanded/garrote
+	cost = 12
+
 /datum/uplink_item/stealthy_weapons/martialarts
 	name = "Martial Arts Scroll"
 	desc = "This scroll contains the secrets of an ancient martial arts technique. You will master unarmed combat, \
diff --git a/code/game/objects/items/weapons/garrote.dm b/code/game/objects/items/weapons/garrote.dm
index bfd76ed0f97..00140497b49 100644
--- a/code/game/objects/items/weapons/garrote.dm
+++ b/code/game/objects/items/weapons/garrote.dm
@@ -1,9 +1,17 @@
-/obj/item/weapon/twohanded/garrote
+/*
+ * Contains:
+ * 	Traitor fiber wire
+ * 	Improvised garrotes
+ */
+
+/obj/item/weapon/twohanded/garrote // 12TC traitor item
 	name = "fiber wire"
-	desc = "A length of razor-thin wire with a wooden handle on either end.<br>You suspect you'd have to be behind the target to use this weapon effectively."
+	desc = "A length of razor-thin wire with an elegant wooden handle on either end.<br>You suspect you'd have to be behind the target to use this weapon effectively."
 	icon_state = "garrot_wrap"
 	w_class = 1
 	var/mob/living/carbon/human/strangling
+	var/improvised = 0
+	var/garrote_time
 
 /obj/item/weapon/twohanded/garrote/update_icon()
 	if(strangling) // If we're strangling someone we want our icon to stay wielded
@@ -12,9 +20,22 @@
 
 	icon_state = "garrot_[wielded ? "un" : ""]wrap"
 
+/obj/item/weapon/twohanded/garrote/improvised // Made via tablecrafting
+	name = "garrote"
+	desc = "A length of cable with a shoddily-carved wooden handle tied to either end.<br>You suspect you'd have to be behind the target to use this weapon effectively."
+	icon_state = "garrot_I_wrap"
+	improvised = 1
+
+/obj/item/weapon/twohanded/garrote/improvised/update_icon()
+	if(strangling)
+		icon_state = "garrot_I_unwrap"
+		return
+
+	icon_state = "garrot_I_[wielded ? "un" : ""]wrap"
+
 /obj/item/weapon/twohanded/garrote/wield(mob/living/carbon/user)
 	if(strangling)
-		user.visible_message("<span class='warning'>[user] removes the [src] from [strangling]'s neck.</span>", \
+		user.visible_message("<span class='info'>[user] removes the [src] from [strangling]'s neck.</span>", \
 				"<span class='warning'>You remove the [src] from [strangling]'s neck.</span>")
 
 		strangling = null
@@ -25,6 +46,14 @@
 		..()
 
 /obj/item/weapon/twohanded/garrote/attack(mob/living/carbon/M as mob, mob/user as mob)
+	if(garrote_time > world.time) // Cooldown
+		return
+
+	if(!istype(user, /mob/living/carbon/human)) // spap_hand is a proc of /mob/living, user is simply /mob
+		return
+
+	var/mob/living/carbon/human/U = user
+
 	if(!wielded)
 		user << "<span class = 'warning'>You must use both hands to garrote [M]!</span>"
 		return
@@ -33,22 +62,22 @@
 		user << "<span class = 'warning'>You don't think that garroting [M] would be very effective...</span>"
 		return
 
-	if(M == user)
-		user << "<span class = 'info'>You decide against strangling yourself for the time being.</span>"
+	if(M == U)
+		U.suicide() // This will display a prompt for confirmation first.
+		return
 
-	if(M.dir != user.dir)
+	if(M.dir != U.dir)
 		user << "<span class='warning'>You cannot use [src] on [M] from that angle!</span>"
 		return
 
+	if(improvised && ((M.head && (M.head.flags & HEADCOVERSMOUTH)) || (M.wear_mask && (M.wear_mask.flags & MASKCOVERSMOUTH)))) // Improvised garrotes are blocked by mouth-covering items.
+		user << "<span class = 'warning'>[M]'s neck is blocked by something they're wearing!</span>"
+
 	if(strangling)
 		user << "<span class = 'warning'>You cannot use [src] on two people at once!</span>"
 		return
 
-	unwield(user)
-
-	if(!istype(user, /mob/living/carbon/human)) // spap_hand is a proc of /mob/living, user is simply /mob
-		return
-	var/mob/living/carbon/human/U = user
+	unwield(U)
 
 	U.swap_hand() // For whatever reason the grab will not properly work if we don't have the free hand active.
 	M.grabbedby(U, 1)
@@ -56,18 +85,23 @@
 	U.swap_hand()
 
 	if(G && istype(G))
-		G.state = GRAB_NECK
-		G.hud.icon_state = "kill"
-		G.hud.name = "kill"
+		if(improvised) // Improvised garrotes start you off with a passive grab, but keep you stunned like an agressive grab.
+			M.Stun(4)
+		else
+			G.state = GRAB_NECK
+			G.hud.icon_state = "kill"
+			G.hud.name = "kill"
+			M.silent += 1
 
+	garrote_time = world.time + 10
 	processing_objects.Add(src)
 	strangling = M
 	update_icon()
 
 	playsound(src.loc, 'sound/weapons/cablecuff.ogg', 15, 1, -1)
 
-	M.visible_message("<span class='danger'>[user] comes from behind and begins garroting [M] with the [src]!</span>", \
-				  "<span class='userdanger'>[user]\ begins garroting you with the [src]! You are unable to speak!</span>", \
+	M.visible_message("<span class='danger'>[U] comes from behind and begins garroting [M] with the [src]!</span>", \
+				  "<span class='userdanger'>[U]\ begins garroting you with the [src]![improvised ? "" : " You are unable to speak!"]</span>", \
 				  "You hear struggling and wire strain against flesh!")
 
 	return
@@ -81,7 +115,6 @@
 		return
 
 	var/mob/living/carbon/human/user = loc
-	var/mob/living/carbon/human/target = strangling
 	var/obj/item/weapon/grab/G
 
 	if(src == user.r_hand && istype(user.l_hand, /obj/item/weapon/grab))
@@ -91,8 +124,8 @@
 		G = user.r_hand
 
 	else
-		user.visible_message("<span class='warning'>[user] loses his grip on [target]'s neck.</span>", \
-				 "<span class='warning'>You lose your grip on [target]'s neck.</span>")
+		user.visible_message("<span class='warning'>[user] loses his grip on [strangling]'s neck.</span>", \
+				 "<span class='warning'>You lose your grip on [strangling]'s neck.</span>")
 
 		strangling = null
 		update_icon()
@@ -101,8 +134,8 @@
 		return
 
 	if(!G.affecting)
-		user.visible_message("<span class='warning'>[user] loses his grip on [target]'s neck.</span>", \
-				"<span class='warning'>You lose your grip on [target]'s neck.</span>")
+		user.visible_message("<span class='warning'>[user] loses his grip on [strangling]'s neck.</span>", \
+				"<span class='warning'>You lose your grip on [strangling]'s neck.</span>")
 
 		strangling = null
 		update_icon()
@@ -110,9 +143,18 @@
 
 		return
 
-	strangling.silent += 1
-	strangling.adjustOxyLoss(2)
-	strangling.apply_damage(2, BRUTE, "head", sharp = 1, edge = 1, used_weapon = "Razor Wire") // Razor sharp wire, causes bleeding in the neck but only if the head is unarmored.
+	if(G.state < GRAB_NECK) // Only possible with improvised garrotes, essentially this will stun people as if they were aggressively grabbed. Allows for resisting out if you're quick, but not running away.
+		strangling.Stun(4)
+
+	if(improvised)
+		strangling.stuttering = max(strangling.stuttering, 3)
+		strangling.apply_damage(2, OXY, "head")
+		return
+
+
+	strangling.silent = max(strangling.silent,  3) // Non-improvised effects
+	strangling.apply_damage(4, OXY, "head")
+
 
 /obj/item/weapon/twohanded/garrote/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is wrapping the [src] around \his neck and pulling the handles! It looks like \he's trying to commit suicide.</span>")
diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm
index fa0a59010d4..db39efa3845 100644
--- a/code/modules/crafting/recipes.dm
+++ b/code/modules/crafting/recipes.dm
@@ -192,4 +192,12 @@
 	result = /obj/item/weapon/soap/ducttape
 	time = 100
 	reqs = list(/obj/item/stack/tape_roll = 1,
-				/datum/reagent/liquidgibs = 10)
\ No newline at end of file
+				/datum/reagent/liquidgibs = 10)
+
+/datum/table_recipe/garrote
+	name = "Makeshift Garrote"
+	result = /obj/item/weapon/twohanded/garrote/improvised
+	time = 15
+	reqs = list(/obj/item/stack/sheet/wood = 1,
+				/obj/item/stack/cable_coil = 5)
+	tools = list(/obj/item/weapon/kitchen/knife) // Gotta carve the wood into handles
\ No newline at end of file
diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi
index e56f92a7cc1f824b04ed9774221e1e4676680f87..728bfaba198f4c5ccacf595db07e583d702f6465 100644
GIT binary patch
delta 5509
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
XXrH^+<CEb2T7j2J>d&eaEJObXgSePy

delta 4778
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
Ef(iLWqyPW_


From 3d229082213fc1b91fb7881a56a825ee89f9c9c9 Mon Sep 17 00:00:00 2001
From: SamCroswell <Sam.Croswell@gmail.com>
Date: Mon, 21 Mar 2016 23:07:19 -0400
Subject: [PATCH 3/3] Stun Value Adjustments

---
 code/game/objects/items/weapons/garrote.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/game/objects/items/weapons/garrote.dm b/code/game/objects/items/weapons/garrote.dm
index 00140497b49..80114bd5dd7 100644
--- a/code/game/objects/items/weapons/garrote.dm
+++ b/code/game/objects/items/weapons/garrote.dm
@@ -86,7 +86,7 @@
 
 	if(G && istype(G))
 		if(improvised) // Improvised garrotes start you off with a passive grab, but keep you stunned like an agressive grab.
-			M.Stun(4)
+			M.Stun(1)
 		else
 			G.state = GRAB_NECK
 			G.hud.icon_state = "kill"
@@ -144,7 +144,7 @@
 		return
 
 	if(G.state < GRAB_NECK) // Only possible with improvised garrotes, essentially this will stun people as if they were aggressively grabbed. Allows for resisting out if you're quick, but not running away.
-		strangling.Stun(4)
+		strangling.Stun(3)
 
 	if(improvised)
 		strangling.stuttering = max(strangling.stuttering, 3)