Skip to content

Security Redux, Forky Edition#27

Open
pirakaplant wants to merge 2 commits intofunky-station:masterfrom
pirakaplant:shitsec
Open

Security Redux, Forky Edition#27
pirakaplant wants to merge 2 commits intofunky-station:masterfrom
pirakaplant:shitsec

Conversation

@pirakaplant
Copy link

About the PR

I added most of the changes implemented by funky-station/funky-station#2828.

It's worth noting, in contrast to that PR:

  • Nightsticks use their own prototype, and truncheons are untouched. (The original version is admittedly a rushjob and I would've done this if I took more time to plan it out.)
  • There are some things that aren't touched by this PR because they're going to get removed or replaced (such as the brigmedic's locker), or aren't in this codebase yet (like SOP and Central Command).
  • Certain changes have been un- or partially-implemented pending the RG-2 being added.

Why / Balance

This is part of an effort to redesign Security to fit our themes better. See funky-station/funky-station#2828 and funky-station/docs#60 for more details.

Technical details

Just YAMLmaxxing with some FTL on the side.

In visitors_startinggear.yml and migration.ftl, there's some lines that are commented out. This is to be appropriately uncommented and filled in when RG-2s and RG-2 safes get ported over from the original Funky codebase.

Media

shitsec-forky.mp4
Screenshot_20260227_174250 Screenshot_20260227_174313

Requirements

  • I have read and am following the Pull Request and Changelog Guidelines.
  • I have added media to this PR or it does not require an in-game showcase.
  • If I am porting something, I have done my best to respect the appropriate licenses associated with the presented changes.

License

MIT

Breaking changes

N/A.

Changelog

🆑 pirakaplant, yaraaray, IamJustHereYouKnow

  • remove: Stun batons, disablers, and tasers have all been removed from the game.
  • add: Nightsticks have been added to the game. (Sprites by yaraaray, sounds by pirakaplant and IamJustHereYouKnow.)
  • tweak: The nonlethals crate is now called the less-lethals crate. It contains nightsticks, security shell guns, and beanbag shells instead of stun batons and disablers.
  • tweak: Almost all references to stun batons, disablers, and/or tasers in the game (e.g. the guidebook, ion stormed laws, figurine lines) have been removed or replaced appropriately.

@github-actions
Copy link
Contributor

RSI Diff Bot; head commit 8251f8d merging into a6111f9
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_Funkystation/Objects/Weapons/Melee/nightstick.rsi

State Old New Status
equipped-BELT Added
icon Added
inhand-left-extend Added
inhand-left Added
inhand-right-extend Added
inhand-right Added
nightstick_extend Added
nightstick_handle Added

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.

1 participant