-
Notifications
You must be signed in to change notification settings - Fork 59
Talon update: Paperwork, Map update and Refreshed Talon uniform become - Standart #1237
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
Open
AzzyDreemurr13
wants to merge
62
commits into
TS-Rogue-Star:master
Choose a base branch
from
AzzyTest13:Upd_stand_talon_uniform
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
62 commits
Select commit
Hold shift + click to select a range
bb90e1a
Update tether_jobs.dm
AzzyDreemurr13 cbcd1c8
Add Talon uniforms with various roles and options
AzzyDreemurr13 d26ef7b
Remove refreshed Talon uniform
AzzyDreemurr13 6512580
talon logo
AzzyDreemurr13 14a91b5
More talon updates
AzzyDreemurr13 5db6287
fixs
AzzyDreemurr13 d6eb40c
Talon map update
AzzyDreemurr13 6331767
Update bureaucracy.dmi
AzzyDreemurr13 f69672f
Update talon_v2.dmm
AzzyDreemurr13 806adde
Update talon_v2.dm
AzzyDreemurr13 2fddee5
fix and fix
AzzyDreemurr13 f41d1a0
Fix sprite
AzzyDreemurr13 da85d8b
Final mouse update
AzzyDreemurr13 18d1848
Apply suggestions from code review
AzzyDreemurr13 75d9ae8
Merge remote-tracking branch 'upstream/master' into Upd_stand_talon_u…
AzzyDreemurr13 2f37311
Fix mouse sprites
AzzyDreemurr13 6033477
Fix suits
AzzyDreemurr13 a5044c1
Last fixing
AzzyDreemurr13 70a02ee
Apply suggestions from code review
AzzyDreemurr13 4417c8d
Update ATTRIBUTIONS.md
AzzyDreemurr13 05ad805
Some small changes
AzzyDreemurr13 a156a69
Merge branch 'master' into Upd_stand_talon_uniform
AzzyDreemurr13 40c9120
516 moment
AzzyDreemurr13 f5de4bb
Back null
AzzyDreemurr13 9932f07
Apply suggestion from @AzzyDreemurr13
AzzyDreemurr13 49bf43f
Update code/modules/clothing/suits/miscellaneous_rs.dm
AzzyDreemurr13 c441b8d
Update code/game/machinery/suit_storage/suit_cycler_units_vr.dm
AzzyDreemurr13 2e0de2d
Review fix 1
AzzyDreemurr13 705bf74
Back old uniform
AzzyDreemurr13 5af2432
Update talon_v2.dm
AzzyDreemurr13 4c38c0d
Comma issue
AzzyDreemurr13 cf8dfde
Merge remote-tracking branch 'upstream/master' into Upd_stand_talon_u…
AzzyDreemurr13 c959f9c
Fixs things after Lira review
AzzyDreemurr13 54d3856
Apply suggestion from @AzzyDreemurr13
AzzyDreemurr13 a7dcf8f
more RS add and edit
AzzyDreemurr13 8739eca
Update news.dm
AzzyDreemurr13 ac3cb32
Apply suggestion from @AzzyDreemurr13
AzzyDreemurr13 2544c28
//RS Edit
AzzyDreemurr13 04a0bee
Back refreshed name
AzzyDreemurr13 8a50684
Merge branch 'master' into Upd_stand_talon_uniform
AzzyDreemurr13 eddb135
RS Add
AzzyDreemurr13 324d92e
Merge remote-tracking branch 'upstream/master' into Upd_stand_talon_u…
AzzyDreemurr13 9fe0bac
Update misc.dm
AzzyDreemurr13 74f3bb9
Merge remote-tracking branch 'upstream/master' into Upd_stand_talon_u…
AzzyDreemurr13 41a6522
Remove duplicate
AzzyDreemurr13 bcb46b1
Merge branch 'TS-Rogue-Star:master' into Upd_stand_talon_uniform
AzzyDreemurr13 412ff0a
review changes
AzzyDreemurr13 44234c7
Update talon_v2.dm
AzzyDreemurr13 e32a8e3
Merge branch 'TS-Rogue-Star:master' into Upd_stand_talon_uniform
AzzyDreemurr13 09bd455
Apply suggestions from code review
AzzyDreemurr13 fc517ba
Apply suggestions from code review
AzzyDreemurr13 0a125ae
Apply suggestions from code review
AzzyDreemurr13 614bcc2
Update loadout_uniform_rs.dm
AzzyDreemurr13 695defa
Merge branch 'TS-Rogue-Star:master' into Upd_stand_talon_uniform
AzzyDreemurr13 4212568
Merge branch 'TS-Rogue-Star:master' into Upd_stand_talon_uniform
AzzyDreemurr13 835b43a
Merge branch 'TS-Rogue-Star:master' into Upd_stand_talon_uniform
AzzyDreemurr13 2e49bb7
Hate display_name (Fix loadout issue) + smoll map upd
AzzyDreemurr13 8c481a1
small pixelshift
AzzyDreemurr13 20e3590
Merge branch 'TS-Rogue-Star:master' into Upd_stand_talon_uniform
AzzyDreemurr13 90d2701
Merge branch 'TS-Rogue-Star:master' into Upd_stand_talon_uniform
AzzyDreemurr13 889bfba
Apply suggestions from code review
AzzyDreemurr13 e12ae9b
Fix sleeping goat bugs with -> )
AzzyDreemurr13 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
|
AzzyDreemurr13 marked this conversation as resolved.
|
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
88 changes: 69 additions & 19 deletions
88
code/modules/client/preference_setup/loadout/loadout_uniform_rs.dm
|
AzzyDreemurr13 marked this conversation as resolved.
|
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.