roles #254
Merged
roles #254
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
RSI Diff Bot; head commit 6316c7c merging into e9e3f60 Resources/Textures/Nuclear14/Clothing/Back/Backpacks/backpackncr.rsi
Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/magnum.rsi
Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/NCRmp.rsi
Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/captainmagnum.rsi
|
Peptide90
pushed a commit
that referenced
this pull request
Jul 24, 2024
## Mirror of PR #26205: [fix decoy bomb uplink category](space-wizards/space-station-14#26205) from <img src="https://avatars.githubusercontent.com/u/10567778?v=4" alt="space-wizards" width="22"/> [space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14) ###### `21c527d6d09847a742202613d8aefce62c79b334` PR opened by <img src="https://avatars.githubusercontent.com/u/57039557?v=4" width="16"/><a href="https://github.com/Ilya246"> Ilya246</a> at 2024-03-17 10:11:15 UTC --- PR changed 1 files with 10 additions and 10 deletions. The PR had the following labels: - No C# --- <details open="true"><summary><h1>Original Body</h1></summary> > <!-- Please read these guidelines before opening your PR: https://docs.spacestation14.io/en/getting-started/pr-guideline --> > <!-- The text between the arrows are comments - they will not be visible on your PR. --> > > ## About the PR > moves the decoy syndicate bomb from explosives category to deception category > > ## Why / Balance > PR was made before the uplink categories update so the bomb ended up miscategorised > > ## Technical details > this is a webedit but it should be sufficiently simple to be fine > > ## Media > <!-- > PRs which make ingame changes (adding clothing, items, new features, etc) are required to have media attached that showcase the changes. > Small fixes/refactors are exempt. > Any media may be used in SS14 progress reports, with clear credit given. > > If you're unsure whether your PR will require media, ask a maintainer. > > Check the box below to confirm that you have in fact seen this (put an X in the brackets, like [X]): > --> > not tested > > - [ ] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase </details> --------- Co-authored-by: SimpleStation14 <Unknown> Co-authored-by: VMSolidus <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added 3 roles to fill the NCR needs:
Standardized the NCR pistols, all of them will carry 9mm
Changed the revolver sprite
Gave the captain role of the NCR a unique revolver