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] You cannot store ammo casings (individual bullets) and ammo boxes (like magazines) in your suit storage #375

Merged
merged 1 commit into from
Nov 1, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#24691
Original PR: tgstation/tgstation#79311

About The Pull Request

What it says on the tin.

Why It's Good For The Game

A) This messes with hotkey muscle memory quite significantly. Unless you have something in suit storage when you go to put a magazine back into your other storage (like your belt), you may accidentally place it into your suit storage.

B) This may be why people think magnetic holsters are bad/don't work. Operatives sometimes hotswap half clips, and what might happen during a particularly intense combat is that they inadvertently put the magazine they just pulled from their gun into their suit storage because they're hotkeying; denying them their magnetic holster's major upside. Snapping their guns back into their storage and away from prying assistant hands.

C) It serves no tactical purpose to put a bullet into your suit storage over the gun itself. Priority should always be to the belt storage.

Changelog

🆑 necromanceranne
qol: To avoid poor magazine discipline, most combat-ready personnel have instructed not to put magazines into the gun loops on their armor vests.
/:cl:

…boxes (like magazines) in your suit storage [MDB IGNORE] (#24691)

* You cannot store ammo casings (individual bullets) and ammo boxes (like magazines) in your suit storage (#79311)

## About The Pull Request

What it says on the tin.

## Why It's Good For The Game

A) This messes with hotkey muscle memory quite significantly. Unless you
have something in suit storage when you go to put a magazine back into
your other storage (like your belt), you may accidentally place it into
your suit storage.

B) This may be why people think magnetic holsters are bad/don't work.
Operatives sometimes hotswap half clips, and what might happen during a
particularly intense combat is that they inadvertently put the magazine
they just pulled from their gun into their suit storage because they're
hotkeying; denying them their magnetic holster's major upside. Snapping
their guns back into their storage and away from prying assistant hands.

C) It serves no tactical purpose to put a bullet into your suit storage
over the gun itself. Priority should always be to the belt storage.

## Changelog
:cl:
qol: To avoid poor magazine discipline, most combat-ready personnel have
instructed _not_ to put magazines into the gun loops on their armor
vests.
/:cl:

* You cannot store ammo casings (individual bullets) and ammo boxes (like magazines) in your suit storage

---------

Co-authored-by: necromanceranne <[email protected]>
@ReezeBL ReezeBL enabled auto-merge (squash) October 31, 2023 22:54
@ReezeBL ReezeBL merged commit 0f88ac0 into master Nov 1, 2023
24 checks passed
AnywayFarus added a commit that referenced this pull request Nov 1, 2023
@ReezeBL ReezeBL deleted the upstream-mirror-24691 branch November 1, 2023 03:40
Iajret pushed a commit that referenced this pull request Jan 9, 2024
…80818) (#375)

Fixes Cameras views on clients 515.1615 or greater (#80818)

## About The Pull Request

Fixes tgstation/tgstation#79954

Turns out the cause of cameras breaking was something weird with how
Byond determined the CENTER location for screen_locs on secondary popup
maps like cameras and the spyglass. This can be remedied by manually
using the LEFT,TOP position for the plane relays. However LEFT,TOP
breaks the views for clients 1614 and below so I included a jank
solution that should allow any client up to this point have the screen
displayed correctly

### 515.1609 views working

![dreamseeker_nolb8BLgRb](https://github.com/tgstation/tgstation/assets/46236974/e155c9c3-12c0-4eb5-a4a6-4e3f09dc456d)

### 515.1623 views working

![dreamseeker_I37Z4X04Hf](https://github.com/tgstation/tgstation/assets/46236974/e91b3bd8-ea05-40e7-ab20-6c48810f9879)
## Why It's Good For The Game

Cameras working passed 1614 means you can update the server. At some
point I suspect Lummox will fix the CENTER position on secondary maps
and when that happens it will likely break the current fix.


## Changelog
:cl:
fix: popup screen locs will work on clients >1614. Security cameras and
Spyglass will work
/:cl:

---------

Co-authored-by: Chubbygummibear <[email protected]>
Co-authored-by: SyncIt21 <[email protected]>
Co-authored-by: LemonInTheDark <[email protected]>
ReezeBL pushed a commit that referenced this pull request Jan 9, 2024
…80818) (#375) (#1505)

Fixes Cameras views on clients 515.1615 or greater (#80818)

## About The Pull Request

Fixes tgstation/tgstation#79954

Turns out the cause of cameras breaking was something weird with how
Byond determined the CENTER location for screen_locs on secondary popup
maps like cameras and the spyglass. This can be remedied by manually
using the LEFT,TOP position for the plane relays. However LEFT,TOP
breaks the views for clients 1614 and below so I included a jank
solution that should allow any client up to this point have the screen
displayed correctly

### 515.1609 views working

![dreamseeker_nolb8BLgRb](https://github.com/tgstation/tgstation/assets/46236974/e155c9c3-12c0-4eb5-a4a6-4e3f09dc456d)

### 515.1623 views working

![dreamseeker_I37Z4X04Hf](https://github.com/tgstation/tgstation/assets/46236974/e91b3bd8-ea05-40e7-ab20-6c48810f9879)
## Why It's Good For The Game

Cameras working passed 1614 means you can update the server. At some
point I suspect Lummox will fix the CENTER position on secondary maps
and when that happens it will likely break the current fix.


## Changelog
:cl:
fix: popup screen locs will work on clients >1614. Security cameras and
Spyglass will work
/:cl:

---------

Co-authored-by: SomeRandomOwl <[email protected]>
Co-authored-by: Chubbygummibear <[email protected]>
Co-authored-by: SyncIt21 <[email protected]>
Co-authored-by: LemonInTheDark <[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