Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gangs Rework - Gamemode #18236

Merged
merged 22 commits into from Mar 22, 2024
Merged

Conversation

TDHooligan
Copy link
Contributor

@TDHooligan TDHooligan commented Mar 18, 2024

About the PR

Gangs rework, if you want more depth, there's a big ol' post here with ALL changes, and the rationales behind them, if that's your thing.

New Items:

  • Quickhack (**'ai open'**s up to 5 doors)
  • Janktank II (Revives a dead gang member, albeit in a dodgy state)

New Mechanics:

  • Tagging
  • Laundering
  • Crate/Loot Drops
  • Leader Dropouts (cryo)

Smaller features:

  • Pop-ups for gang leaders
  • Ghosts can view gang territories on gang rounds
  • Gang leaders have a different icon to gang members
  • Gangs have uniquely colored antag icons

Why's this needed?

woe betide ye security mains. the greytide is coming once more

Changelog

(u)TDHooligan
(*) Gangs has been reworked! Read below for deets. Send feedback in the discord thread or forum. 
(*) Gang member point pools are separate now. Huzzah!
(*) Gang lockers can no longer be broken.
(*) Gang leaders can buy the new 'Janktank II' to revive fellow gang members
(*) You can now launder thousands of credits at once. 
(*) Tagging has been reworked, read below for details.
(*) New gang loot bags & crates are hidden throughout the shift. Watch your radios, gang!
(+) Territory is now a circle around tags, and tags now provide points based on how many people they see pass by.
(+) You can only tag near your existing territory, starting where your locker is placed
(+) You should look to expand to populated areas, as quickly as possible!
(+) Your uniform also grants buffs if you're in your territory, and regen if you're by your locker.
(+) ---
(+) Every point earned also grants the gang 1 point of 'Street Cred'
(+) Street cred can be spent by leaders to hire new gang members, or buy revival syringes for their gang.
(+) ---
(+) Check your gang radio for new events:
(+) A few times a shift, loot bags are randomly hidden. Interrogate civilians, or their PDAs, to find where they are!
(+) Twice per shift, a large weapons cache will spawn, locked in place. fight to drag it back to your locker!
(+) ---
(+) Sprites by Mora, Guv, JOEL, Blackrep, what, Moriarty, Rubi, Shmiggy and Cogwerks. thank you so much :)

@boring-cyborg boring-cyborg bot added the C-Sprites Automatically applied on any .dmi or icons folder change label Mar 18, 2024
@github-actions github-actions bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Mar 18, 2024
@TDHooligan TDHooligan changed the title gang rewark gamemode Gangs Rework Mar 18, 2024
@TDHooligan TDHooligan changed the title Gangs Rework Gangs Rework - Gamemode Mar 18, 2024
@TobleroneSwordfish TobleroneSwordfish added the E-FUCK [Dev Only] FUCK label Mar 18, 2024
@Flaborized
Copy link
Contributor

Hi haven't followed the development on this particularly closely but read through the big writeup; the feature ideas here are awesome and seem very fun, great work. Gang definitely needs the improvements and this seems like a really good direction to pull it in. I didn't read the code though so this is not a code review :shelterfrog:

@TobleroneSwordfish
Copy link
Contributor

Some initial jank in no particular order:

  • Pill bottles should be able to go in gang lockers.
  • The message for pouring a beaker of drugs into a gang locker claims you put the beaker into the locker.
  • The gang locker is non-dense. I think we talked about this at some point, but discord won't let me search threads properly so uhh why is it non-dense?
  • The round seems to end instantly when the shuttle is auto-called?
  • The little points popup doesn't display when putting drugs into a locker.

Copy link
Contributor

@TobleroneSwordfish TobleroneSwordfish left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got about halfway through, code looks generally good so far.

code/datums/abilities/ghost_observer.dm Outdated Show resolved Hide resolved
code/datums/abilities/ghost_observer.dm Outdated Show resolved Hide resolved
code/datums/abilities/ghost_observer.dm Outdated Show resolved Hide resolved
_std/types.dm Outdated Show resolved Hide resolved
code/datums/controllers/process/gang.dm Outdated Show resolved Hide resolved
code/datums/gamemodes/gangwar.dm Outdated Show resolved Hide resolved
code/datums/gamemodes/gangwar.dm Outdated Show resolved Hide resolved
code/datums/gamemodes/gangwar.dm Outdated Show resolved Hide resolved
code/datums/gamemodes/gangwar.dm Show resolved Hide resolved
code/datums/gamemodes/gangwar.dm Outdated Show resolved Hide resolved
@Studenterhue Studenterhue added the E-Add-To-Wiki A PR that will require changes to the wiki label Mar 18, 2024
@TDHooligan
Copy link
Contributor Author

TDHooligan commented Mar 19, 2024

  • Pill bottles should be able to go in gang lockers.

sure. can do

  • The message for pouring a beaker of drugs into a gang locker claims you put the beaker into the locker.

oops

  • The gang locker is non-dense. I think we talked about this at some point, but discord won't let me search threads properly so uhh why is it non-dense?

we had this discussion around the merge. mostly because it's unbreakable and 99% of the time, in tiny areas. if it being a solid locker is a problem it'd just be better as a different sprite/object entirely

  • The round seems to end instantly when the shuttle is auto-called?

i thought this was because of running local for some reason, and never questioned it :shelterwot:

  • The little points popup doesn't display when putting drugs into a locker.

odd. ill investigate

Copy link
Contributor

@TobleroneSwordfish TobleroneSwordfish left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the rest!

code/datums/gamemodes/gangwar.dm Outdated Show resolved Hide resolved
code/datums/gamemodes/gangwar.dm Outdated Show resolved Hide resolved
code/datums/gamemodes/gangwar.dm Outdated Show resolved Hide resolved
code/datums/gamemodes/gangwar.dm Outdated Show resolved Hide resolved
code/datums/gamemodes/gangwar.dm Outdated Show resolved Hide resolved
code/modules/antagonists/gang/gang_member.dm Outdated Show resolved Hide resolved
code/modules/status_system/statusEffects.dm Outdated Show resolved Hide resolved
if(times >= 1)
elapsedTime -= (round(times) * tickSpacing)
for(var/i in 1 to times)
H.HealDamage("All", 0.2, 0.2, 0)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a huge fan of magical passive healing, maybe only when on low health/in crit?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

idk. admittedly it existed in the old version and i facelifted it. for now it further encourages gang members stickin near their locker?

code/obj/item/device/pda2/pda2.dm Outdated Show resolved Hide resolved
Copy link
Contributor

@TobleroneSwordfish TobleroneSwordfish left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually it looks like gang tags might not be working right? They seem to always be at max heat, possibly because the var they use to track mobs is called mobs which shadows the global list mobs and you're accessing it without using src

@TDHooligan
Copy link
Contributor Author

Actually it looks like gang tags might not be working right? They seem to always be at max heat, possibly because the var they use to track mobs is called mobs which shadows the global list mobs and you're accessing it without using src

they seem ok to me. they're all relative though so you need at least 2 tags to compare (the hottest tag is what 'max heat' is)

Co-authored-by: TobleroneSwordfish <20713227+TobleroneSwordfish@users.noreply.github.com>
@TobleroneSwordfish TobleroneSwordfish merged commit f3c948d into goonstation:master Mar 22, 2024
23 checks passed
github-actions bot pushed a commit that referenced this pull request Mar 22, 2024
@TDHooligan TDHooligan deleted the rework branch March 23, 2024 17:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C-Sprites Automatically applied on any .dmi or icons folder change E-Add-To-Wiki A PR that will require changes to the wiki E-FUCK [Dev Only] FUCK size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants