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

Removes progression from midround and latejoin traitor, renames reputation to threat level #174

Merged
merged 2 commits into from Oct 21, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#24374
Original PR: tgstation/tgstation#79020

About The Pull Request

Reputation has been renamed to 'Threat Level' to more accurately represent what it means.
Midround and latejoin traitors no longer have access to secondary objectives, the ones which give TC and objectives.

Why It's Good For The Game

Midround antagonists, like traitor, shouldn't really have the progression system that is meant for roundstart. Final objectives in particular are only suited for traitors who have worked towards it from the start.
Reputation wasn't really a good name for the player-facing progression system of traitors as you'd passively gain progression which didn't make since if it was supposed to be your reputation.

Changelog

🆑 Watermelon914
balance: Removed secondary objectives from midround and latejoin traitors.
grammar: Renamed reputation to threat level.
/:cl:

…mes reputation to threat level [MDB IGNORE] (#24374)

* Removes progression from midround and latejoin traitor, renames reputation to threat level (#79020)

## About The Pull Request
Reputation has been renamed to 'Threat Level' to more accurately
represent what it means.
Midround and latejoin traitors no longer have access to secondary
objectives, the ones which give TC and objectives.

## Why It's Good For The Game
Midround antagonists, like traitor, shouldn't really have the
progression system that is meant for roundstart. Final objectives in
particular are only suited for traitors who have worked towards it from
the start.
Reputation wasn't really a good name for the player-facing progression
system of traitors as you'd passively gain progression which didn't make
since if it was supposed to be your reputation.

## Changelog
:cl:
balance: Removed secondary objectives from midround and latejoin
traitors.
grammar: Renamed reputation to threat level.
/:cl:

---------

Co-authored-by: Watermelon914 <3052169-Watermelon914@ users.noreply.gitlab.com>

* Removes progression from midround and latejoin traitor, renames reputation to threat level

* Lone infiltrator was using this exact path

---------

Co-authored-by: Watermelon914 <37270891+Watermelon914@users.noreply.github.com>
Co-authored-by: Watermelon914 <3052169-Watermelon914@ users.noreply.gitlab.com>
Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com>
@Iajret Iajret added the Discuss First Данный ПР стоит обсудить с другими педалями. Обычно нужен только для фич с апстрима label Oct 20, 2023
@AnywayFarus AnywayFarus self-requested a review October 21, 2023 16:09
@Iajret Iajret merged commit 2fafe40 into master Oct 21, 2023
22 checks passed
@Iajret Iajret deleted the upstream-mirror-24374 branch October 21, 2023 16:18
Iajret pushed a commit that referenced this pull request Dec 31, 2023
* Fixes confetti shotgun shells (#174)

* initial

* fix confetti shell

* donkpocket sprites and more

* this is for a different PR

* forgot these

* ..()

* reviews

* // instead of /// for overrides

---------

Co-Authored-By: Bloop <13398309+vinylspiders@users.noreply.github.com>

* New Quirk: Appendicitis Survivor (#77)

## About The Pull Request
Title.

## How This Contributes To The Nova Sector Roleplay Experience
Spontaneous appendicitis is.. an event!

This adds the Appendicitis Survivor quirk from my server,
[TaleStation](https://github.com/TaleStation/TaleStation).

Its a positive (-2) quirk, while low impact, some people may appreciate.
Its also another low cost quirk, so people could pick it up if so
desired.

## Proof of Testing

<details>
<summary>Screenshots/Videos</summary>


![image](https://github.com/GalacticStation/GalaxiaStation/assets/70232195/1f807368-f811-4d1d-b2c5-34f8508e6fcb)

  
</details>

## Changelog

:cl: Jolly
add: New quirk for those who hate their appendix: Appendicitis Survivor!
A positive (-2) quirk.
/:cl:

* Improves the names, descriptions, and extended descriptions of nearly all my firearms (#90)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

Three steps

1. Guns no longer list their company in their name, this made some gun
names too long to refer to or just look weird.
2. Every gun now tells you what it fires in its examine if it didn't
before.
3. Every gun's examine text now hints that you can double examine for
more info on the weapon.

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

Makes a lot of information about these weapons more convenient or more
apparent than they were before, and removes some unneeded information
(like we didnt really have to have the guys that made the gun displayed
straight in the name, you can see the company that makes them in the
examine text already).

<!-- Please add a short description of why you think these changes would
benefit the game and the roleplay atmosphere of the server. If you can't
justify it in words, it might not be worth adding. -->

<!-- Include any screenshots/videos/debugging steps of the code
functioning successfully, between the </summary> and </details> code
blocks. -->
<!-- To our mappers and spriters: Posting screenshots of content INSIDE
EDITORS (aseprite, PDN, SDMM, ect) is NOT valid proof of testing. Please
make sure that you COMPILE the game and provide PROOF you tested your
edits. -->

<details>
<summary>Screenshots/Videos</summary>

![image](https://github.com/GalacticStation/GalaxiaStation/assets/82386923/cd4976fe-c641-4464-82ee-935aff63f159)

![image](https://github.com/GalacticStation/GalaxiaStation/assets/82386923/b1dc1edc-72fd-4235-a47d-84c36cae0679)

</details>

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
qol: The names and descriptions of every paxilmaniac weapon have been
improved to be shorter (names) and mention at least what bullet the
weapon fires (description)
qol: Every weapon with an extended description has a hint in its normal
examine telling you that you can look further to get more info on the
weapon
code: Two instances of now-deleted weapons paths (which i found out
about through someone getting one in a christmas tree) existing due to
manufacturer examines of all things have been cleaned up, players wont
notice this one i think
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

* Re-adding Cat Scream (Normalized) (#123)

* Re-adding Cat Scream (Normalized)

* Update modular_nova/modules/emotes/code/scream_datums.dm

Renamed the file from cat.ogg to cat_scream.ogg

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Renamed cat.ogg to cat_scream.ogg

* removed cat.ogg and replaced with cat_scream.ogg

* Removes old scream sounds, renames it properly

---------

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>

* [MODULAR] Fixes clockcult slab ui, some runtimes (#122)

Fixes slab ui, some runtimes

* [MODULAR] Fixes colonial cloaks not being able to hold any suit storage items (#129)

* Fixes imperial police cloak not being able to hold any suit storage items

* Moves this to the NRI police cloak

* Moves this to the NRI police cloak

* Update clothing.dm

* Update modular_nova/modules/novaya_ert/code/police_outfit.dm

---------

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Resprited Vox Clothing (Nova Station Edition) (#97)

* Resprited Vox Clothing

* Update screenshot_humanoids__datum_species_vox_primalis.png

---------

Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>

* Chitter emote is the TG chitter sound unless you're a moth (#111)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

Changes the *chitter emote to play the standard TG chitter sfx, unless
you're a moth, then it plays the moth chitter.

TG chitter is cute.

<!-- Include any screenshots/videos/debugging steps of the code
functioning successfully, between the </summary> and </details> code
blocks. -->
<!-- To our mappers and spriters: Posting screenshots of content INSIDE
EDITORS (aseprite, PDN, SDMM, ect) is NOT valid proof of testing. Please
make sure that you COMPILE the game and provide PROOF you tested your
edits. -->

<details>
<summary>Screenshots/Videos</summary>

https://github.com/NovaSector/NovaSector/assets/77534246/eae4fc45-d104-4588-8537-394da9304151

</details>

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
add: Chitter emote has a different sound effect, unless you're a moth
/:cl:

* Adds fancy masquerade masks (#180)

* Adds masquerade masks, making them available in the AutoDrobe

Thanks to Crumpaloo for the sprites!

* Early mirror of tgstation/tgstation#80663

They're not properly usable otherwise

* Updates the sprites so they've got transparent eyes

* Adds the masks to the loadout

* Fixes variation flags and muzzled GAGS config, makes it act as internals

* Adjust some of the sprites a bit more, making snouted ones have smaller eyeholes, and vox ones looking more like masquerade masks

* Updates the sprites for the Vox Primalis!

---------

* Update greyscale_configs.dm

* Fixes Niftsoft Settings Panel (#208)

Fixes Niftsoft Settings

* 0

---------

Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
Co-authored-by: Kyogon <30851775+Kyogon@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
Co-authored-by: HalcyonicWolf <mmeade362@gmail.com>
Co-authored-by: SomeRandomOwl <2568378+SomeRandomOwl@users.noreply.github.com>
Iajret pushed a commit that referenced this pull request Jan 3, 2024
* initial

* fix confetti shell

* donkpocket sprites and more

* this is for a different PR

* forgot these

* ..()

* reviews

* // instead of /// for overrides

---------

Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Balance Discuss First Данный ПР стоит обсудить с другими педалями. Обычно нужен только для фич с апстрима TG Mirror
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants