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 << "This area is unsuitable for territory tagging." ///////////////////////////////////////// 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 << "This mind is resistant to recruitment!" 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 << "This mind is resistant to recruitment!" 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: Click Here"