Adds security vouchers and moves sabres into a side-grade from pistols #13721
Conversation
Allows carbon fiber sabre sheaths to be stored in suit storage slots. This is achieved by: - Adding the ITEM_SLOT_SUITSTORE flag to the sheath. - Updating the description to reflect the new functionality. - Adding the sheath to the security_vest_allowed list. - Fixing an issue where the suit storage overlay would not display correctly if item_state or icon_state were not defined.
|
I am not sure if it'll ever be used in the suit storage... |
|
From what we discussed earlier, this PR should also include the choice between gun and saber in some form.
This was brought about as an alternative to making the sword fit on the normal security belt. Bacon does not want the sword on the main security belt and wants security to have to make a more substantial sacrifice for carrying it. This PR would make it compete with the NPS or other firearms instead of the belt slot |
PowerfulBacon
left a comment
PowerfulBacon
left a comment
There was a problem hiding this comment.
Does this render thr sprite on the opposite side of the player? If you have 2 swords at the same time, then you should have one on the left side of your body and the other on the right side.
it does not, but that'd be badass. I'm doing that |
Moves the suit store overlay instantiation to a dedicated function. Corrects pixel offset application for species-specific adjustments. The X offset was previously adding instead of subtracting.
Adds a voucher system to security vending machines. This allows for the redemption of specific equipment through a menu-driven system. Removes direct equipment spawning from job outfits, instead providing vouchers to redeem at vending machines.
as requested |
TsunamiAnt
changed the title
Provides an additional magazine to the security vending machine's NPS-10 loadout. The mining DMI was also updated.
|
Does the HOS get a voucher aswell, if not could be well to add a sword to their locker |
|
We have guns in the armoury right? We should probably put 1 or 2 swords there too, or have them in a locker only warden and HOS can use so extras can be given out if someone either asks for it or needs it. |
Adds a security voucher box and spawns it in the warden's locker. Adds carbon fiber sabres to the pistol spawner in the armory
done so. The warden now also gets a box with a few vouchers |
There was a problem hiding this comment.
I prefer this over the other one for two reasons:
- It makes more sense to force a choice between gun and saber than it does between belt and saber
- This PR doesn't show a graphical bug in the vending machine (stocking the sheath in machine shows it as empty)
Ultimately I like and approve both, but this is my choice to merge between the two
PowerfulBacon
left a comment
PowerfulBacon
left a comment
There was a problem hiding this comment.
I like this PR, but you need to fill out the 'why its good for the game section' properly.
|
Well as long as the Warden/HoS can give spare vouches... Just a few questions So the only ranged option the officers would have if they pick up the sabre would be the taser? How much ammo do you get when you redeem the gun, the one in the gun + a spare one? How much ammo is in the armory and can it be ordered? After so many iterations the main feeling I've got for both the taser and pistol was that it's not easily available and once armory runs out it's gg (not assuming you just upgrade to whatever gun you want on armory on blue alert+) What does HoS starts with now, only the PTSD? |
|
Update your changelog |
oop fixed! |
Until alert is elevated and/or armory is justified yes |
|
I like this PR, but I am weary of making sec nerfs in the current state of sec. I would feel much more confident in getting #13546 merged first. Perhaps we should make a separate branch for security updates and then merge this into that, before merging that branch into master. |
|
After some discussion internally, I think this could go through but I wouldn't put all the security PRs through at the same time. |
Renames the security voucher redemption proc for consistency. This change ensures that the proc name follows the established naming conventions, improving code readability and maintainability.
Changes the security voucher redemption process to spawn a box containing the selected equipment. This ensures that the redeemed items are contained and easily managed, preventing them from being scattered around the vendor location. The spawned box is then given to the redeemer. If they can't hold it, it is dropped on the floor at their location.
Updates the voucher redemption process to use `tgui_input_list` for a better user experience. Renames local variable for clarity.
|
All reviews accounted for! |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
TsunamiAnt
force-pushed
the
sheathstoarmor
branch
from
5a6994a to
6dc5cc5
Compare
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Refactors how the suit storage overlay is generated and applied. It now leverages the `build_worn_icon` proc for more consistent icon generation and handles potential pixel offsets related to species DNA. The layering of icons is also handled more consistently.
|
rage |
|
updated testing evidence because It was bad |
|
Sec voucher looks like a chocolate bar |
7 participants
About The Pull Request
Adds Security Vouchers
Redeem them at the sec-tech for a either a pistol or a sword.
Allows carbon fiber sabre sheaths to be stored in suit storage slots.
Tweaks the logic of suit storage overlays a bit to make this possible.
ofc also removes both pistols and mags from default sec loadout, since you get them via voucher now.
Why It's Good For The Game
This brings the sabre from a decision of "sabres or stunweapons" to a decision of "sabres or pistols", which is overall a more reasonable choice to have the player make, because we still required them to carry nonlethal anyway, which means we present them with the illusion of a choice which in truth only has one correct answer. Obviously horrible design.
Vouchers are a better solution to this than say, beacons.
Testing Photographs and Procedure
Screenshots&Videos
Voucher and locker without sword, notice the gun is gone too.
Using the voucher
puts a box in your hand
Sword on suit storage slot:
Sword on belt slot to illustrate how it's on the other side
Changelog
🆑
add: Added security vouchers, redeem at sec vendor
tweak: Moved sabres and pistols from loadouts and lockers into the voucher system.
balance: Made sabre sheaths fit in suit storages
/:cl: