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

[MIRROR] [Non-modular] Security bots now check if you're allowed to carry that gun by default #2785

Merged
merged 1 commit into from
Apr 9, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Original PR: NovaSector/NovaSector#1832

About The Pull Request

There's a setting on security bots that makes them try to detain you if you're visibly carrying a weapon without permit. This PR makes it enabled by default.

How This Contributes To The Nova Sector Roleplay Experience

Makes it more risky to be careless, and puts less of a responsibility on secoffs to be examining EVERYONE EVERYWHERE.

Proof of Testing

Screenshots/Videos
Desktop.2024.04.06.-.03.10.06.11.mp4

Changelog

🆑 honkpocket
balance: Security bots now start with the 'check for weapon permit' option enabled
/:cl:

… gun by default (#1832)

* initial

* Update code/modules/mob/living/simple_animal/bot/secbot.dm

* Update secbot.dm

---------

Co-authored-by: Bloop <[email protected]>
@Iajret Iajret merged commit 8b5f70c into master Apr 9, 2024
26 checks passed
@Iajret Iajret deleted the upstream-mirror-1832 branch April 9, 2024 16:45
AnywayFarus added a commit that referenced this pull request Apr 9, 2024
Iajret pushed a commit that referenced this pull request Jun 1, 2024
…ates (#2785)

* Pillow now consumes stamina in both unwielded and wielded states (#83444)

## About The Pull Request
There was some issue about players being kept in stamcrit via stamina
damage refreshing the timer. @Watermelon914 has confirmed that refresh
mechanic is ok but only with stamina weapon with limited charges, pillow
does not have charges in its unwielded state so I have added some. Now
there is a limited amount of hits you can make before being stam crit
yourself. Self damage for wielded state have also been increased to
create a trade off between dealing more damage and how much self damage
you take.
## Why It's Good For The Game
## Changelog
:cl:
balance: Attack with a pillow now consumes 5 stamina regardless of
wielded or not.
/:cl:

* Pillow now consumes stamina in both unwielded and wielded states

---------

Co-authored-by: FinancialGoose <[email protected]>
Co-authored-by: NovaBot13 <[email protected]>
AnywayFarus pushed a commit that referenced this pull request Jun 2, 2024
…ates (#2785) (#3585)

* Pillow now consumes stamina in both unwielded and wielded states (#83444)

## About The Pull Request
There was some issue about players being kept in stamcrit via stamina
damage refreshing the timer. @Watermelon914 has confirmed that refresh
mechanic is ok but only with stamina weapon with limited charges, pillow
does not have charges in its unwielded state so I have added some. Now
there is a limited amount of hits you can make before being stam crit
yourself. Self damage for wielded state have also been increased to
create a trade off between dealing more damage and how much self damage
you take.
## Why It's Good For The Game
## Changelog
:cl:
balance: Attack with a pillow now consumes 5 stamina regardless of
wielded or not.
/:cl:

* Pillow now consumes stamina in both unwielded and wielded states

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: FinancialGoose <[email protected]>
Co-authored-by: NovaBot13 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants