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

Bouncers, Barriers, NPC Reloading and Stripper Sanctuary #711

Open
wants to merge 42 commits into
base: master
Choose a base branch
from

Conversation

hex37
Copy link
Contributor

@hex37 hex37 commented Feb 8, 2025

About The Pull Request

x
Adds a system of Bouncers that monitor areas that only certain players can enter/exit. If attacked, they will chase down their target. If moved, they will return to their original position after a time.

Players can either talk their way through, or simply just kill the guards to gain entry.

Police can flash their badge to have a slightly easier time of talking their way past the door.

Alternatively, someone with permissions can pull in someone who is not allowed, being their plus one.

  • Two barriers are stationed on two of the entrances to the theatre. Only Ghouls and Kindred may enter.
    x

  • Typical entrances to the tower now require that you are a ghoul or a kindred to enter safely.
    x

  • One barrier has been stationed outside the Giovanni mansion. Familiga only. Unlike other bouncers they have tommy guns.
    x

  • Alters the downstairs of the strip club to be a formal neutral ground / elysium where nonhumans of the city can gather. Staff too, are allowed entry.
    x

  • The downstairs of the strip club is now marked as an Elysium.
    x

  • The Stripper role has been altered to identify that they might interact with weird people, and have been encouraged to not care

  • The lower floor of the elysium looks like just a little nicer now
    x

  • Many different types of NPCs now have the capacity to reload their weapon or switch to a backup weapon if their gun is emptied.

  • Bouncers and criminals will in fact shoot la policia, regardless if they have a badge or not.

  • NPCs now equip weapons on their person if possible.
    -x

Why It's Good For The Game

Allows for there to be officially designated areas where creatures of the night can talk shop. Antags will need to do a little extra work to access these areas. The barrier system is extensible, and can be used to section off multiple types of places to prevent random players from wandering in.

Changelog

🆑
add: system of Bouncers that monitor checkpoints that only certain players can enter/exit. If attacked, they will chase down their target and eventually return to their original location. They can be persuaded past, with Examine, using a social check or by using a badge in the player's active hand. Alternatively, the checkpoint can be disabled if all NPCs are killed, knocked out, or disabled.
add: Bouncer Checkpoint for the strip club's downstairs, checks if nonhuman or strip club employee
add: 2 Bouncer Checkpoints for Tower, checks if vampire or ghoul
add: 2 Bouncer Checkpoint for the Theatre, checks if vampire or ghoul
add: Bouncer Checkpoint for the Giovanni Mansion, checks if in familiga role
add: more tables and chairs to the elysium level of the strip club
balance: NPCs now reload their weapons
balance: Criminal NPCs like bandits and bouncers will attack police if threatened
refactor: The Stripper role has been altered to work similar to Janitor. They are aware of nonhumans but have been encouraged to not care
refactor: The downstairs of the strip club is now marked as an Elysium.
sound: added audio for being blocked by the checkpoint
/:cl:

@hex37 hex37 changed the title Bouncers, Barriers, NPC Reloading, Pull mobs down stairs, and Stripper Sanctuary Bouncers, Barriers, NPC Reloading and Stripper Sanctuary Feb 8, 2025
@AllCorruptingWyrm
Copy link
Contributor

lets get this bread

@hex37
Copy link
Contributor Author

hex37 commented Feb 8, 2025

BIG UPDATE TO CODE:

  • NPCs no longer drop guns when knocked over or killed. (@Metekillot asked for it, not me!)

@hex37
Copy link
Contributor Author

hex37 commented Feb 8, 2025

SECOND UPDATE:

  • Bouncers and criminals will now shoot la policia, even if they have a badge.

@Miraviel Miraviel added the Map Edit Thank you for your tile-placing service. It's always appreciated. label Feb 8, 2025
Copy link
Contributor

@Metekillot Metekillot left a comment

Choose a reason for hiding this comment

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

first review is up. please make sure you're testing your code even if you make what seems to be a little tiny change. i just now had to hotfix something because i wasn't doing that myself.

code/modules/vtr13/structures/vip_barrier.dm Outdated Show resolved Hide resolved
code/modules/vtr13/structures/vip_barrier.dm Outdated Show resolved Hide resolved
code/modules/vtr13/structures/vip_barrier.dm Outdated Show resolved Hide resolved
code/modules/vtr13/structures/vip_barrier.dm Outdated Show resolved Hide resolved
code/modules/vtr13/structures/vip_barrier.dm Outdated Show resolved Hide resolved
code/modules/wod13/npc.dm Outdated Show resolved Hide resolved
code/modules/wod13/npc_movement.dm Outdated Show resolved Hide resolved
code/modules/wod13/npc_movement.dm Outdated Show resolved Hide resolved
code/modules/wod13/npc_movement.dm Outdated Show resolved Hide resolved
code/modules/wod13/npc_movement.dm Outdated Show resolved Hide resolved
@hex37 hex37 requested a review from Metekillot February 9, 2025 10:24
@XanderDox XanderDox added the Feature Exposes new bugs in interesting ways label Feb 9, 2025
@XanderDox
Copy link
Contributor

Please make a proper changelog for the updates channel!

@hex37
Copy link
Contributor Author

hex37 commented Feb 9, 2025

Please make a proper changelog for the updates channel!

sure lemme just finish up lichy's requested change and I'll get it better formatted

@hex37
Copy link
Contributor Author

hex37 commented Feb 9, 2025

@XanderDox changelog updated

@hex37
Copy link
Contributor Author

hex37 commented Feb 10, 2025

🥺
it must be merged,,,

@hex37
Copy link
Contributor Author

hex37 commented Feb 10, 2025

Code is now compliant with new regulations,,,

@hex37
Copy link
Contributor Author

hex37 commented Feb 11, 2025

resolved the map merge conflict by redoing the entire map side of the commit

  • The Strip club's lower floor is a little nicer now

Copy link
Contributor

@Metekillot Metekillot left a comment

Choose a reason for hiding this comment

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

passes the sniff test, i'll ask other maintainers to glance over and do some testing then i don't see any blocking changes

code/game/objects/wod13/items.dm Outdated Show resolved Hide resolved
code/modules/wod13/npc_movement.dm Outdated Show resolved Hide resolved
code/modules/projectiles/wod13/gun.dm Outdated Show resolved Hide resolved
code/modules/wod13/npcs/bouncer_mob.dm Outdated Show resolved Hide resolved
code/modules/wod13/npcroles.dm Outdated Show resolved Hide resolved
code/modules/wod13/npcroles.dm Outdated Show resolved Hide resolved
code/modules/wod13/npcroles.dm Outdated Show resolved Hide resolved
code/modules/wod13/npcroles.dm Outdated Show resolved Hide resolved
code/modules/wod13/npcroles.dm Outdated Show resolved Hide resolved
@hex37
Copy link
Contributor Author

hex37 commented Feb 13, 2025

All done, lmk when you need to merge so I can rebase the map

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Exposes new bugs in interesting ways Map Edit Thank you for your tile-placing service. It's always appreciated.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants