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] Fixes the M-90GL saying that it takes 5.56 when it actually takes .223. (Shush this is the same bullet) #2200

Merged
merged 1 commit into from
Mar 1, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#1210
Original PR: tgstation/tgstation#81716

About The Pull Request

I removed 5.56m so this is just a grammar fix

Why It's Good For The Game

Boolet

Changelog

🆑 necromanceranne
fix: The M-90GL now correctly states that it accepts .223 toploader magazines.
/:cl:

…takes .223. (Shush this is the same bullet) (#1210)

* Fixes the M-90GL saying that it takes 5.56 when it actually takes .223. (Shush this is the same bullet) (#81716)

* Fixes the M-90GL saying that it takes 5.56 when it actually takes .223. (Shush this is the same bullet)

---------

Co-authored-by: necromanceranne <[email protected]>
@Iajret Iajret merged commit 8fe6f23 into master Mar 1, 2024
24 checks passed
@Iajret Iajret deleted the upstream-mirror-1210 branch March 1, 2024 14:02
AnywayFarus added a commit that referenced this pull request Mar 1, 2024
Iajret pushed a commit that referenced this pull request Apr 27, 2024
…wn Uplink (#2200)

* [NO GBP] Overwatch Intelligence Agents No Longer Get Their Own Uplink (#82884)

## About The Pull Request

Overwatch operatives no longer get an uplink with TC in it.

While they failed to break out of the nukie base (GOOD!) they were able
to call in more of each other, which led to a grey-goo scenario of
self-replicating discount overwatch operatives (KINDA BAD BUT ALSO KIND
OF FUNNY).


![image](https://github.com/tgstation/tgstation/assets/28870487/28683e31-dc98-496f-9ef8-e05516444c17)


![image](https://github.com/tgstation/tgstation/assets/28870487/7be759b3-2d91-47bc-8a2b-9efc94e7bad9)

I really really really hate having to fix this bug because it ended up
being fucking hilarious but it cannot happen again.

(Also some minor inheritance gripes with the plasmeme outfit, don't
worry about it).

I also might make the turfs indestructible/have a better baseturf so
accidental explosive discharges can't break the floor and space everyone
in the nukie base areas in another PR.
## Why It's Good For The Game

Self-replicating helpdesk assistants, a terrifying concept.
## Changelog
:cl: Rhials
fix: Overwatch Intelligence Agents no longer get their own uplinks,
leading to a self-replicating grey goo scenario.
/:cl:

* [NO GBP] Overwatch Intelligence Agents No Longer Get Their Own Uplink

---------

Co-authored-by: Rhials <[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