diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 184f4d02a3..30089f298f 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -69,6 +69,7 @@ var/post_noise = FALSE var/datum/team/gang/gang //For marking territory. + var/gang_tag_delay = 30 //this is the delay for gang mode tag applications on anything that gang = true on. /obj/item/toy/crayon/suicide_act(mob/user) user.visible_message("[user] is jamming [src] up [user.p_their()] nose and into [user.p_their()] brain. It looks like [user.p_theyre()] trying to commit suicide!") @@ -324,7 +325,7 @@ audible_message("You hear spraying.") playsound(user.loc, 'sound/effects/spray.ogg', 5, 1, 5) - var/takes_time = !instant + var/takes_time = !instant //For order purposes, since I'm maximum bad. if(gang_mode) takes_time = TRUE @@ -333,7 +334,7 @@ wait_time *= 3 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. + if(!do_after(user, gang_tag_delay, target = target)) //25 is a good number, but we have gang_tag_delay var now. return if(length(text_buffer)) @@ -345,7 +346,7 @@ if(actually_paints) if(gang_mode) - // Double check it wasn't tagged in the meanwhile + // Double check it wasn't tagged in the meanwhile. if(!can_claim_for_gang(user, target)) return tag_for_gang(user, target) @@ -588,6 +589,7 @@ is_capped = TRUE self_contained = FALSE // Don't disappear when they're empty can_change_colour = TRUE + gang = TRUE //Gang check is true for all things upon the honored hierarchy of spraycans, except those that are FALSE. validSurfaces = list(/turf/open/floor, /turf/closed/wall) reagent_contents = list("welding_fuel" = 1, "ethanol" = 1) @@ -733,6 +735,7 @@ icon_capped = "deathcan2_cap" icon_uncapped = "deathcan2" use_overlays = FALSE + gang = FALSE volume_multiplier = 25 charges = 100 @@ -747,6 +750,7 @@ icon_capped = "clowncan2_cap" icon_uncapped = "clowncan2" use_overlays = FALSE + gang = FALSE reagent_contents = list("lube" = 1, "banana" = 1) volume_multiplier = 5 @@ -759,6 +763,7 @@ icon_capped = "mimecan_cap" icon_uncapped = "mimecan" use_overlays = FALSE + gang = FALSE can_change_colour = FALSE paint_color = "#FFFFFF" //RGB @@ -770,9 +775,10 @@ /obj/item/toy/crayon/spraycan/gang charges = 20 // Charges back to 20, which is the default value for them. gang = TRUE + gang_tag_delay = 15 //Its 50% faster than a regular spraycan, for tagging. After-all they did spend points/meet the boss. pre_noise = FALSE - post_noise = TRUE + post_noise = TRUE // Its even more stealthy just a tad. /obj/item/toy/crayon/spraycan/gang/Initialize(loc, datum/team/gang/G) ..() @@ -784,7 +790,7 @@ /obj/item/toy/crayon/spraycan/gang/examine(mob/user) . = ..() if(user.mind && user.mind.has_antag_datum(/datum/antagonist/gang) || isobserver(user)) - to_chat(user, "This spraycan has been specially modified for tagging territory.") + to_chat(user, "This spraycan has been specially modified with a stage 2 nozzle kit, making it faster.") #undef RANDOM_GRAFFITI #undef RANDOM_LETTER diff --git a/modular_citadel/code/game/gamemodes/gangs/gang.dm b/modular_citadel/code/game/gamemodes/gangs/gang.dm index 8192041e3e..00ce3f81a9 100644 --- a/modular_citadel/code/game/gamemodes/gangs/gang.dm +++ b/modular_citadel/code/game/gamemodes/gangs/gang.dm @@ -193,7 +193,7 @@ "hands" = SLOT_HANDS ) - if(gangtool) + if(gangtool)//Here is where all of the text occurs when a gang boss first spawns in. var/obj/item/device/gangtool/G = new() var/where = H.equip_in_one_of_slots(G, slots) if (!where) @@ -201,7 +201,7 @@ else G.register_device(H) to_chat(H, "The Gangtool in your [where] will allow you to purchase weapons and equipment, send messages to your gang, and recall the emergency shuttle from anywhere on the station.") - to_chat(H, "As the gang boss, you can also promote your gang members to lieutenant. Unlike regular gangsters, Lieutenants cannot be deconverted and are able to use recruitment pens and gangtools.") + to_chat(H, "As the gang boss, you can also promote your gang members to lieutenant. Unlike regular gangsters, Lieutenants cannot be deconverted and are able to use gangtools too.") if(pen) var/obj/item/pen/gang/T = new() @@ -209,7 +209,7 @@ if (!where2) to_chat(H, "Your Syndicate benefactors were unfortunately unable to get you a recruitment pen to start.") else - to_chat(H, "The recruitment pen in your [where2] will help you get your gang started. Stab unsuspecting crew members with it to recruit them.") + to_chat(H, "The recruitment pen in your [where2] will help you get your gang started. Stab unsuspecting crew members with it to recruit them. All gangsters can use these, distribute them to see your gang grow.") if(spraycan) var/obj/item/toy/crayon/spraycan/gang/SC = new(null,gang) @@ -327,7 +327,7 @@ GLOB.gangs -= src ..() -/datum/team/gang/roundend_report() +/datum/team/gang/roundend_report() //roundend report. var/list/report = list() report += "[name]:" if(winner) @@ -342,9 +342,10 @@ return "
[report.Join("
")]
" -/datum/team/gang/proc/greet_gangster(datum/mind/gangster) +/datum/team/gang/proc/greet_gangster(datum/mind/gangster) //The text a person receives when recruited. to_chat(gangster, "You are now a member of the [name] Gang!") - to_chat(gangster, "Help your bosses take over the station by claiming territory with special spraycans only they can provide. Simply spray on any unclaimed area of the station.") + to_chat(gangster, "Help your bosses take over the station by claiming territory with spraycans. Simply spray on any unclaimed area of the station.") + to_chat(gangster, "You can also use recruitment pens to recruit more to your cause, If your boss provides you one.") to_chat(gangster, "Their ultimate objective is to take over the station with a Dominator machine.") to_chat(gangster, "You can identify your mates by their large, \[G\] icon.") gangster.store_memory("You are a member of the [name] Gang!") diff --git a/modular_citadel/code/game/gamemodes/gangs/gang_datums.dm b/modular_citadel/code/game/gamemodes/gangs/gang_datums.dm index 010778413b..334d6bf423 100644 --- a/modular_citadel/code/game/gamemodes/gangs/gang_datums.dm +++ b/modular_citadel/code/game/gamemodes/gangs/gang_datums.dm @@ -3,7 +3,7 @@ // color (must be a hex, "blue" isn't acceptable due to how spraycans are handled) // inner_outfits (must be a list() with typepaths of the clothes in it. One is fine, but there is support for multiple: one will be picked at random when bought) // outer_outfits (same as above) -// You also need to make a gang graffiti, that will go in crayondecal.dmi inside our icons(not tg's), with the same name of the gang it's assigned to. Nothing else,just the icon. +// You also need to make a gang graffiti, that will go in crayondecal.dmi inside our icons, with the same name of the gang it's assigned to. Nothing else,just the icon. // Those are all required. If one is missed, stuff could break. /datum/team/gang/clandestine diff --git a/modular_citadel/code/game/gamemodes/gangs/gang_items.dm b/modular_citadel/code/game/gamemodes/gangs/gang_items.dm index ccaab546e5..0f16b6462b 100644 --- a/modular_citadel/code/game/gamemodes/gangs/gang_items.dm +++ b/modular_citadel/code/game/gamemodes/gangs/gang_items.dm @@ -76,7 +76,7 @@ var/outfit = pick(gang.outer_outfits) if(outfit) var/obj/item/O = new outfit(user.loc) - O.armor = O.armor.setRating(melee = 20, bullet = 35, laser = 10, energy = 10, bomb = 30, bio = 0, rad = 0, fire = 30, acid = 30) + O.armor = O.armor.setRating(melee = 25, bullet = 35, laser = 15, energy = 10, bomb = 30, bio = 0, rad = 0, fire = 30, acid = 30) O.desc += " Tailored for the [gang.name] Gang to offer the wearer moderate protection against ballistics and physical trauma." user.put_in_hands(O) to_chat(user, " This is your gang's official outerwear, wearing it will increase your influence") @@ -135,6 +135,12 @@ icon_state = "knuckles" w_class = 3 +datum/gang_item/clothing/shades //Addition: Why not have cool shades on a gang member anyways? + name = "Cool Sunglasses" + id = "glasses" + cost = 5 + item_path = /obj/item/clothing/glasses/sunglasses + /datum/gang_item/clothing/belt name = "Badass Belt" id = "belt" @@ -168,7 +174,7 @@ cost = 5 item_path = /obj/item/switchblade -/datum/gang_item/weapon/surplus +/datum/gang_item/weapon/surplus //For when a gang boss is extra broke or cheap. name = "Surplus Rifle" id = "surplus" cost = 6 @@ -177,7 +183,7 @@ /datum/gang_item/weapon/ammo/surplus_ammo name = "Surplus Rifle Ammo" id = "surplus_ammo" - cost = 5 + cost = 3 item_path = /obj/item/ammo_box/magazine/m10mm/rifle /datum/gang_item/weapon/improvised @@ -308,7 +314,7 @@ /datum/gang_item/equipment/wetwork_boots name = "Wetwork boots" id = "wetwork" - cost = 10 + cost = 8 item_path = /obj/item/clothing/shoes/combat/gang /obj/item/clothing/shoes/combat/gang diff --git a/modular_citadel/code/game/gamemodes/gangs/gang_pen.dm b/modular_citadel/code/game/gamemodes/gangs/gang_pen.dm index ceb780a8c5..3dfdf4dd9b 100644 --- a/modular_citadel/code/game/gamemodes/gangs/gang_pen.dm +++ b/modular_citadel/code/game/gamemodes/gangs/gang_pen.dm @@ -9,12 +9,13 @@ . = ..() last_used = world.time -/obj/item/pen/gang/attack(mob/living/M, mob/user, stealth = TRUE) +/obj/item/pen/gang/attack(mob/living/M, mob/user, stealth = TRUE) //ha if(!istype(M)) return if(!ishuman(M) || !ishuman(user) || M.stat == DEAD) return ..() - var/datum/antagonist/gang/boss/L = user.mind.has_antag_datum(/datum/antagonist/gang/boss) + //var/datum/antagonist/gang/boss/L = user.mind.has_antag_datum(/datum/antagonist/gang/boss) //Pen works with bosses only. + var/datum/antagonist/gang/L = user.mind.has_antag_datum(/datum/antagonist/gang) //Pen works with anyone in gang. if(!L) return ..() if(!..())