diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm
index 859369384c..efa09a8021 100644
--- a/code/game/objects/items/crayons.dm
+++ b/code/game/objects/items/crayons.dm
@@ -332,8 +332,8 @@
if(paint_mode == PAINT_LARGE_HORIZONTAL)
wait_time *= 3
- if(takes_time)
- if(!do_after(user, 50, target = target))
+ if(takes_time) //This is what deteremines the time it takes to spray a tag in gang mode. 50 is Default.
+ if(!do_after(user, 25, target = target)) //Lets try 25 instead of giving them all spraycans.
return
if(length(text_buffer))
diff --git a/code/game/objects/items/implants/implant_mindshield.dm b/code/game/objects/items/implants/implant_mindshield.dm
index 2c197eb7ec..ae7abc6d63 100644
--- a/code/game/objects/items/implants/implant_mindshield.dm
+++ b/code/game/objects/items/implants/implant_mindshield.dm
@@ -26,7 +26,7 @@
if(target.mind.has_antag_datum(/datum/antagonist/brainwashed))
target.mind.remove_antag_datum(/datum/antagonist/brainwashed)
- if(target.mind.has_antag_datum(/datum/antagonist/rev/head) || target.mind.unconvertable)
+ if(target.mind.has_antag_datum(/datum/antagonist/rev/head) || target.mind.unconvertable || target.mind.has_antag_datum(/datum/antagonist/gang/boss))
if(!silent)
target.visible_message("[target] seems to resist the implant!", "You feel something interfering with your mental conditioning, but you resist it!")
var/obj/item/implanter/I = loc
@@ -37,9 +37,12 @@
I.update_icon()
return FALSE
+ var/datum/antagonist/gang/gang = target.mind.has_antag_datum(/datum/antagonist/gang)
var/datum/antagonist/rev/rev = target.mind.has_antag_datum(/datum/antagonist/rev)
if(rev)
rev.remove_revolutionary(FALSE, user)
+ if(gang)
+ target.mind.remove_antag_datum(/datum/antagonist/gang)
if(!silent)
if(target.mind in SSticker.mode.cult)
to_chat(target, "You feel something interfering with your mental conditioning, but you resist it!")
diff --git a/modular_citadel/code/game/gamemodes/gangs/gang_items.dm b/modular_citadel/code/game/gamemodes/gangs/gang_items.dm
index f808229661..f3c1fc91b0 100644
--- a/modular_citadel/code/game/gamemodes/gangs/gang_items.dm
+++ b/modular_citadel/code/game/gamemodes/gangs/gang_items.dm
@@ -171,7 +171,7 @@
/datum/gang_item/weapon/surplus
name = "Surplus Rifle"
id = "surplus"
- cost = 7
+ cost = 6
item_path = /obj/item/gun/ballistic/automatic/surplus
/datum/gang_item/weapon/ammo/surplus_ammo
@@ -183,7 +183,7 @@
/datum/gang_item/weapon/improvised
name = "Sawn-Off Improvised Shotgun"
id = "sawn"
- cost = 6
+ cost = 5
item_path = /obj/item/gun/ballistic/revolver/doublebarrel/improvised/sawn
/datum/gang_item/weapon/ammo/improvised_ammo
@@ -195,7 +195,7 @@
/datum/gang_item/weapon/pistol
name = "10mm Pistol"
id = "pistol"
- cost = 25
+ cost = 20
item_path = /obj/item/gun/ballistic/automatic/pistol
/datum/gang_item/weapon/ammo/pistol_ammo
@@ -207,7 +207,7 @@
/datum/gang_item/weapon/sniper
name = "Black Market .50cal Sniper Rifle"
id = "sniper"
- cost = 40
+ cost = 30
item_path = /obj/item/gun/ballistic/automatic/sniper_rifle
/datum/gang_item/weapon/ammo/sniper_ammo
@@ -225,7 +225,7 @@
/datum/gang_item/weapon/machinegun
name = "Mounted Machine Gun"
id = "MG"
- cost = 50
+ cost = 40
item_path = /obj/machinery/manned_turret
spawn_msg = "The mounted machine gun features enhanced responsiveness. Hold down on the trigger while firing to control where you're shooting."
@@ -236,13 +236,13 @@
/datum/gang_item/weapon/uzi
name = "Uzi SMG"
id = "uzi"
- cost = 60
+ cost = 50
item_path = /obj/item/gun/ballistic/automatic/mini_uzi
/datum/gang_item/weapon/ammo/uzi_ammo
name = "Uzi Ammo"
id = "uzi_ammo"
- cost = 30
+ cost = 20
item_path = /obj/item/ammo_box/magazine/uzim9mm
///////////////////
@@ -256,7 +256,7 @@
/datum/gang_item/equipment/spraycan
name = "Territory Spraycan"
id = "spraycan"
- cost = 5
+ cost = 1
item_path = /obj/item/toy/crayon/spraycan/gang
/datum/gang_item/equipment/spraycan/spawn_item(mob/living/carbon/user, datum/team/gang/gang, obj/item/device/gangtool/gangtool)
@@ -285,13 +285,13 @@
/datum/gang_item/equipment/frag
name = "Fragmentation Grenade"
id = "frag nade"
- cost = 7
+ cost = 5
item_path = /obj/item/grenade/syndieminibomb/concussion/frag
/datum/gang_item/equipment/stimpack
name = "Black Market Stimulants"
id = "stimpack"
- cost = 12
+ cost = 10
item_path = /obj/item/reagent_containers/syringe/stimulants
/datum/gang_item/equipment/implant_breaker
@@ -308,7 +308,7 @@
/datum/gang_item/equipment/wetwork_boots
name = "Wetwork boots"
id = "wetwork"
- cost = 12
+ cost = 10
item_path = /obj/item/clothing/shoes/combat/gang
/obj/item/clothing/shoes/combat/gang
@@ -317,10 +317,16 @@
permeability_coefficient = 0.01
clothing_flags = NOSLIP
+datum/gang_item/equipment/shield
+ name = "Riot Shield"
+ id = "riot_shield"
+ cost = 25
+ item_path = /obj/item/shield/riot
+
/datum/gang_item/equipment/pen
name = "Recruitment Pen"
id = "pen"
- cost = 25
+ cost = 20
item_path = /obj/item/pen/gang
spawn_msg = "More recruitment pens will allow you to recruit gangsters faster. Only gang leaders can recruit with pens."
@@ -343,7 +349,7 @@
/datum/gang_item/equipment/gangtool
id = "gangtool"
- cost = 10
+ cost = 5
/datum/gang_item/equipment/gangtool/spawn_item(mob/living/carbon/user, datum/team/gang/gang, obj/item/device/gangtool/gangtool)
var/item_type
diff --git a/modular_citadel/code/game/gamemodes/gangs/gangs.dm b/modular_citadel/code/game/gamemodes/gangs/gangs.dm
index 6e4bf752a6..9151107d6f 100644
--- a/modular_citadel/code/game/gamemodes/gangs/gangs.dm
+++ b/modular_citadel/code/game/gamemodes/gangs/gangs.dm
@@ -19,6 +19,12 @@ GLOBAL_LIST_EMPTY(gangs)
var/list/datum/mind/gangboss_candidates = list()
+/datum/game_mode/gang/generate_report()
+ return "Cybersun Industries representatives claimed that they, in joint research with the Tiger Cooperative, have made a major breakthrough in brainwashing technology, and have \
+ made the nanobots that apply the \"conversion\" very small and capable of fitting into usually innocent objects - namely, pens. While they refused to outsource this technology for \
+ months to come due to its flaws, they reported some as missing but passed it off to carelessness. At Central Command, we don't like mysteries, and we have reason to believe that this \
+ technology was stolen for anti-Nanotrasen use. Be on the lookout for territory claims and unusually violent crew behavior, applying mindshield implants as necessary."
+
/datum/game_mode/gang/pre_setup()
if(CONFIG_GET(flag/protect_roles_from_antagonist))
restricted_jobs += protected_jobs