From 9c10cec883100ecb86aab5789ce75c00328dd161 Mon Sep 17 00:00:00 2001
From: Ikarrus <ericgfwong@hotmail.com>
Date: Mon, 20 Apr 2015 08:31:19 -0600
Subject: [PATCH] Gang mode changelog and minute tweaks

- Gang mode changelog
- Recruitment doesn't cause an obvious seizure any more
- Removed reduced usage on territory spraycans
- Spraycans will notify you if the area you are spraying at is not a valid one for tagging
---
 code/game/objects/items/crayons.dm | 1 -
 code/game/objects/items/toys.dm    | 2 ++
 code/modules/paperwork/pen.dm      | 6 ------
 html/changelogs/Ikarrus-gang3.yml  | 6 ++++++
 4 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 html/changelogs/Ikarrus-gang3.yml

diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm
index fbffa30e777..1a120d0f33b 100644
--- a/code/game/objects/items/crayons.dm
+++ b/code/game/objects/items/crayons.dm
@@ -155,6 +155,5 @@
 /obj/item/toy/crayon/spraycan/gang
 	desc = "A suspicious-looking spraycan modified to use special paint used by gangsters to mark territory."
 	icon_state = "spraycan_gang_cap"
-	uses = 20
 	gang = 1
 	instant = -1
\ No newline at end of file
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 8e102ad2225..68a4b1935dd 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -427,6 +427,8 @@
 				if(!(locate(/obj/effect/decal/cleanable/crayon/gang) in target)) //Ignore the check if the tile being sprayed has a gang tag
 					if(territory_claimed(territory, user))
 						return
+			else
+				user << "<span class='warning'>This area is unsuitable for territory tagging.</span>"
 		/////////////////////////////////////////
 
 		var/graf_rot
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 75303ca55c5..7045311cb55 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -95,19 +95,13 @@
 					if(user.mind in ticker.mode.A_bosses)
 						if(ticker.mode.add_gangster(M.mind,"A"))
 							M.Paralyse(5)
-							M.Jitter(500)
 							cooldown(ticker.mode.A_gang.len, )
-							spawn(40)
-								M.jitteriness -= 490
 						else
 							user << "<span class='warning'>This mind is resistant to recruitment!</span>"
 					else if(user.mind in ticker.mode.B_bosses)
 						if(ticker.mode.add_gangster(M.mind,"B"))
 							M.Paralyse(5)
-							M.Jitter(500)
 							cooldown(ticker.mode.B_gang.len)
-							spawn(40)
-								M.jitteriness -= 490
 						else
 							user << "<span class='warning'>This mind is resistant to recruitment!</span>"
 				else
diff --git a/html/changelogs/Ikarrus-gang3.yml b/html/changelogs/Ikarrus-gang3.yml
new file mode 100644
index 00000000000..103a630eef7
--- /dev/null
+++ b/html/changelogs/Ikarrus-gang3.yml
@@ -0,0 +1,6 @@
+author: Ikarrus
+
+delete-after: True
+
+changes: 
+  - wip: "Gang mode has had some considerable work done on it, including a new objective and currency dynamic. Check out the changes on the wiki: <a target=\"_blank\" href=\"https://tgstation13.org/wiki/Gang_War\">Click Here</a>"