Gangs Rework Part 2: Vandalism and Graffiti #18986

TDHooligan · 2024-05-18T05:05:04Z

[GAMEMODES] [FEATURE] [QOL]

About the PR

Adds a new feature: Vandalism!

Occasionally, gangs are tasked with vandalising a department instead of having a duffle drop.
Vandalism includes:

Graffiti with the new Spray Can
- A bunch of new graffiti sprites, made by myself and a few community contributors
Crowbarring floor tiles (with some prevention)
Violence against NPCs
Breaking glass tables/Vending machines
Breaking lights

Gang members must achieve 500 'Vandalism Points' by breaking stuff in the department, where the Duffle bag they're looking for will drop by their feet.

2024-05-18.06-00-36.mp4

Additional Features:

Gang members start with 1500 points.
Cheap weapons now rebalanced, to compete for your starting points.
New graffiti special attack that partially blinds for a few seconds, tagging the victim
Baseball bat special now knocks back on crit, with no stuns. Added to gang locker as a middle-tier weapon.
New 'Machete' end-game item, competing with D-Saber and Katana
- New special 'Massacre' attack, with an even more lethal version added to Slasher since Zonespace liked it.
'View scoreboard' button added to the Gang Locker to see where your gang stands
Slightly improved locker UI
Spawns have been improved for Duffle Bags.

Graffiti special:
'Spray Burst' - A quick, harmless attack that temporarily blinds, defaces and disorients targets.
https://github.com/goonstation/goonstation/assets/6061314/93b8f3ef-b0bf-45fe-a901-9f549b106224

Baseball special:
'Baseball Swing' - Swipe, but knocks back on crit (15% chance)

Machete special:
'Butcher' - A risky all-in manoeuvre. Three quick low-damage swipes. If they all hit, the user sacrifices all their stamina to continue swinging until they're out of stamina or miss. If they miss, they take a few seconds of disorient.
https://github.com/goonstation/goonstation/assets/6061314/1149a1d5-933b-43fa-b915-776eeda58037

Machete special - Slasher
'Massacre' - Similar, but doesn't risk stamina. If the victim doesn't escape, damage escalates, then eventually delimbs, then decapitates.
https://github.com/goonstation/goonstation/assets/6061314/ee67e576-bbdc-47c9-ad7f-1c03769c98c9

Why's this needed?

More ways to get duffles reliably. Less dependence on players going along with it.
Also more gang/crew tension. Smashing a department has consequences...
Fixbatch for several QoL issues in there too, and a little more content for more gang variety.

Changelog

(u)TDHooligan
(*)Gangs may now be tasked with vandalising departments!
(*)Gangs have new weapons & equipment available in their locker.
(*)Gangs can now view a scoreboard from their locker.
(+)Gangs start with 1500 points.
(+)Gangs now have access to regular, cleanable graffiti. This can't be used to claim territory.
(+)Baseball bats' special attack knocks back on crit.
(+)Item costs have been rebalanced to compete for these starting points.

TDHooligan · 2024-05-18T05:11:14Z

~~graffiti hit sfx still needs implementing~~
~~lower graffiti times~~
~~telesci fx for the duffle spawning~~
~~make machinery/objects count tiles as ineligible for duffle spawns~~

Glamurio · 2024-05-18T21:09:31Z

This has everything I'd want it to have. It's good that doing the floor graffiti gives significantly more points than simply smashing things, so there's an extra incentive to do that.

Is there any kind of tracker to avoid boring point farming? Like... standing in one spot, and repeatedly breaking the floor tile and fixing it? Does fixing things in a department detract points? If not, maybe it should.

TDHooligan · 2024-05-18T22:19:52Z

boring shit like that is hard to code fixes for and is boring for players anyway. if its an issue ill do something about it.

FlameArrow57

Cool! Just did a minor styling/sanity check review, not in-depth

code/obj/table.dm

code/modules/vending/vending.dm

_std/defines/gang.dm

code/datums/controllers/process/gang.dm

code/modules/items/specials/ItemSpecials.dm

code/datums/gamemodes/gangwar.dm

TDHooligan · 2024-05-23T13:39:25Z

merging caused buggery.

…Hooligan/goonstation into aint-nothin-like-a-funky-beat

NightmareChamillian · 2024-05-24T16:25:12Z

I love this! Can I suggest breaking (or maybe only damaging to prevent depressurization) windows as well?

TDHooligan · 2024-05-24T16:42:41Z

I love this! Can I suggest breaking (or maybe only damaging to prevent depressurization) windows as well?

already considered but if you're told smack a window and get points for it, odds are youre not gonna stop just because you arent getting number for it any more

ZeWaka

tldr organize please

ZeWaka · 2024-06-06T18:08:22Z

code/obj/item/misc_weapons.dm

+
+
+
+/obj/item/gang_machete


please put this in an organized file, not dump it here

ZeWaka · 2024-06-06T18:08:40Z

code/modules/items/specials/ItemSpecials.dm

@@ -2232,3 +2363,153 @@ ABSTRACT_TYPE(/datum/item_special/spark)
 		if(progress == 1)
 			state = ACTIONSTATE_FINISH
 			return
+
+
+/datum/item_special/massacre


ZeWaka · 2024-06-06T18:08:51Z

code/modules/items/specials/ItemSpecials.dm

@@ -1853,6 +1864,86 @@ ABSTRACT_TYPE(/datum/item_special/spark)
 				playsound(master, 'sound/effects/swoosh.ogg', 50, FALSE)
 		return

+
+/datum/item_special/graffiti


TobleroneSwordfish

I absolutely love the new graffiti stuff, it feels great to use and the sprites look incredible!
But for the love of god in future please atomize these changes 🥺 this could have been at least 3 separate PRs very easily and would likely have gotten reviewed/merged a lot faster!

TobleroneSwordfish · 2024-06-09T13:44:47Z

code/datums/gamemodes/gangwar.dm

+		switch (length(spraycan.graffititargets))
+			if (1)
+				duration = 4 SECONDS
+			if (2)
+				duration = 6 SECONDS
+			if (3)
+				duration = 8 SECONDS


Might be a little smoother if you call updateBar after this (and maybe also do it on start because the bar seems to stutter at first)

TobleroneSwordfish · 2024-06-09T13:47:55Z

code/datums/gamemodes/gangwar.dm

+	inventory_counter_enabled = TRUE
+	w_class = W_CLASS_TINY
+
+	update_icon()


Should call this on New to set the initial counter.

TobleroneSwordfish · 2024-06-09T13:51:36Z

code/datums/gamemodes/gangwar.dm

+	category = "Consumable"
+
+/datum/gang_item/equipment/graffiti
+	name = "'ProPaint' Spray Can"
+	desc = "Non-permanent graffiti, great for vandalism & blinding the fuzz. Not able to claim territory."
+	class2 = "consumable"


consumable and consumable?

TobleroneSwordfish · 2024-06-09T13:58:32Z

code/mob.dm

@@ -2422,7 +2422,7 @@
 		if (thr?.get_throw_travelled() <= 410)
 			if (!((thr.throw_type & THROW_CHAIRFLIP) && ismob(hit)))
 				random_brute_damage(src, min((6 + (thr?.get_throw_travelled() / 5)), (src.health - 5) < 0 ? src.health : (src.health - 5)))
-				if (!src.hasStatus("knockdown"))
+				if (!src.hasStatus("knockdown") && (thr.throw_type & THROW_BASEBALL))


This changes global behaviour to make only baseball throws stun, I don't think that's what you want.

TobleroneSwordfish · 2024-06-09T14:02:32Z

code/modules/items/specials/ItemSpecials.dm

+		for(var/turf/T in list(one, two, three))
+			for(var/atom/movable/A in T)
+				if(A in attacked) continue
+				if(isliving(A))


Make this a continue guard too, cleaner

TobleroneSwordfish · 2024-06-09T14:08:57Z

code/modules/status_system/statusEffects.dm

+	var/counter = 0
+	var/sound = 'sound/effects/electric_shock_short.ogg'
+	var/count = 7


Doc comment counter and count, easily confused var intent

TobleroneSwordfish · 2024-06-09T14:11:03Z

code/modules/status_system/statusEffects.dm

+	onRemove()
+		qdel(hud)
+		hud = null
+		. = ..()


Double onRemove definition (don't you just love that this is legal byond code?)

TobleroneSwordfish · 2024-06-09T14:12:51Z

code/obj/item/misc_weapons.dm

+
+	New()
+		..()
+		src.AddComponent(/datum/component/bloodflick)


Not sure if this an issue with the base component but this seems to cause a runtime on the third attack of each chain

TobleroneSwordfish · 2024-06-09T14:16:18Z

code/obj/item/misc_weapons.dm

+	on_spin_emote(mob/user)
+		SEND_SIGNAL(src, COMSIG_ITEM_TWIRLED, user, src)
+		animate_spin(src, prob(50) ? "L" : "R", 1, 0)


What is this actually doing? It just seems to be recreating some of the base behaviour of the twirl emote (and sending the signal twice). If you want the behaviour of the twirl emote then just make the user do the emote instead.

TDHooligan added 8 commits May 6, 2024 15:39

add sprays n tags

15aa091

more graffito

edc5d36

graffito 2

35555a6

wip

3c38c82

add scoreboards. more graffiti stuff.

110b807

vandalism ahoy

c475fc6

starting pts!

7555464

odds

4188d3e

boring-cyborg bot added C-Sound Automatically applied on any .ogg or sound folder change. C-Sprites Automatically applied on any .dmi or icons folder change labels May 18, 2024

github-actions bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label May 18, 2024

keywordlabeler bot added A-Gamemodes Changes or additions to any gamemode's main features C-Feature A new feature or enhancements to existing features C-QoL A quality of life improvement that makes the game easier to play labels May 18, 2024

github-actions bot added the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label May 18, 2024

bat, machettey, specials

f902d15

github-actions bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels May 19, 2024

TDHooligan added 2 commits May 19, 2024 21:31

tweak sfx

88d6eb2

bwoink

ced0bcf

FlameArrow57 reviewed May 20, 2024

View reviewed changes

TDHooligan added 4 commits May 21, 2024 21:28

fixes

a47f1a8

address comments

b8f93b6

cleanup

58c0bb6

guh

9479662

TDHooligan marked this pull request as ready for review May 23, 2024 13:33

TDHooligan requested a review from Kyle2143 as a code owner May 23, 2024 13:33

Merge branch 'master' into aint-nothin-like-a-funky-beat

30ba0e6

TDHooligan requested review from mordent-goonstation, ZeWaka and Tarmunora as code owners May 23, 2024 13:36

Merge branch 'master' into aint-nothin-like-a-funky-beat

dd77903

TDHooligan added 3 commits May 23, 2024 14:43

cleanup

809c2e1

Merge branch 'aint-nothin-like-a-funky-beat' of https://github.com/TD…

c5320d1

…Hooligan/goonstation into aint-nothin-like-a-funky-beat

file didn't stage ):

b25fb45

github-actions bot removed the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label May 23, 2024

github-actions bot added the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label May 26, 2024

TDHooligan added 2 commits June 6, 2024 02:52

Merge branch 'master' into aint-nothin-like-a-funky-beat

85c7ca2

Merge branch 'master' into aint-nothin-like-a-funky-beat

19fd28d

github-actions bot removed the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label Jun 6, 2024

Merge branch 'master' into aint-nothin-like-a-funky-beat

e64c41b

ZeWaka requested changes Jun 6, 2024

View reviewed changes

TobleroneSwordfish requested changes Jun 9, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Gangs Rework Part 2: Vandalism and Graffiti #18986

Gangs Rework Part 2: Vandalism and Graffiti #18986

TDHooligan commented May 18, 2024 •

edited

TDHooligan commented May 18, 2024 •

edited

Glamurio commented May 18, 2024

TDHooligan commented May 18, 2024 •

edited

FlameArrow57 left a comment

TDHooligan commented May 23, 2024

NightmareChamillian commented May 24, 2024

TDHooligan commented May 24, 2024

ZeWaka left a comment

ZeWaka Jun 6, 2024

ZeWaka Jun 6, 2024

ZeWaka Jun 6, 2024

TobleroneSwordfish left a comment •

edited

TobleroneSwordfish Jun 9, 2024

TobleroneSwordfish Jun 9, 2024

TobleroneSwordfish Jun 9, 2024

TobleroneSwordfish Jun 9, 2024

TobleroneSwordfish Jun 9, 2024

TobleroneSwordfish Jun 9, 2024

TobleroneSwordfish Jun 9, 2024

TobleroneSwordfish Jun 9, 2024

TobleroneSwordfish Jun 9, 2024




		/obj/item/gang_machete

Gangs Rework Part 2: Vandalism and Graffiti #18986

Are you sure you want to change the base?

Gangs Rework Part 2: Vandalism and Graffiti #18986

Conversation

TDHooligan commented May 18, 2024 • edited

About the PR

Additional Features:

Why's this needed?

Changelog

TDHooligan commented May 18, 2024 • edited

Glamurio commented May 18, 2024

TDHooligan commented May 18, 2024 • edited

FlameArrow57 left a comment

Choose a reason for hiding this comment

TDHooligan commented May 23, 2024

NightmareChamillian commented May 24, 2024

TDHooligan commented May 24, 2024

ZeWaka left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TobleroneSwordfish left a comment • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TDHooligan commented May 18, 2024 •

edited

TDHooligan commented May 18, 2024 •

edited

TDHooligan commented May 18, 2024 •

edited

TobleroneSwordfish left a comment •

edited