mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 13:10:02 +01:00
Merge pull request #9080 from Ikarrus/gangtweaks3
Gang mode changelog and minute tweaks
This commit is contained in:
@@ -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
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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>"
|
||||
Reference in New Issue
Block a user