forked from tgstation/tgstation
-
Notifications
You must be signed in to change notification settings - Fork 87
Adds Envirosuits and Co. to The Loadout #1072
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
beeperoil
wants to merge
28
commits into
DopplerShift13:master
Choose a base branch
from
beeperoil:Loadout-Envirosuits
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
28 commits
Select commit
Hold shift + click to select a range
9246efc
Reorganize the loadout; Head
beeperoil 8b5da83
Fixed line 84 to have a / at the beginning
beeperoil 30ca84c
Merge branch 'DopplerShift13:master' into master
beeperoil 81ae38c
Fixed indentation on line 82
beeperoil 9af376e
Renames loadout items
beeperoil 8fad8c1
Renames a beret to sit with the other berets
beeperoil 8072b9a
Renames a beret to sit with the other berets
beeperoil 5fffdca
Adds proper spacing on line 97
beeperoil b7e5cd0
Renames the bandanas to sit next to each other in loadout
beeperoil fbb3c6f
Removes 2 cowboy hats because i forgot to before
beeperoil 9268020
Merge branch 'DopplerShift13:master' into master
beeperoil cdc9c95
Merge branch 'DopplerShift13:master' into master
beeperoil 831634a
Merge branch 'DopplerShift13:master' into master
beeperoil 58b9a77
Merge branch 'DopplerShift13:master' into master
beeperoil ae1d369
Merge branch 'DopplerShift13:master' into master
beeperoil 86ac43e
Merge branch 'DopplerShift13:master' into master
beeperoil 748cbbd
Merge branch 'DopplerShift13:master' into master
beeperoil 0a741ac
Merge branch 'DopplerShift13:master' into master
beeperoil 5fe8279
Merge branch 'DopplerShift13:master' into master
beeperoil 866876e
Merge branch 'DopplerShift13:master' into master
beeperoil a369c13
Merge branch 'master' of https://github.com/beeperoil/DopplerShift
beeperoil 30a639f
Merge branch 'DopplerShift13:master' into master
beeperoil 7e653f2
adds phorid stuff to the loadout yaay
beeperoil 5d9ced9
oops not the pr for it
beeperoil 732512c
creates new categories for the envirosuit stuff
beeperoil 4b48d1b
Merge branch 'master' into Loadout-Envirosuits
beeperoil d36862c
changes the envirogloves so that they include a "phorid" keyword
beeperoil 62c151f
Merge branch 'master' into Loadout-Envirosuits
beeperoil 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
consider changing to
Phorid Envirogloves (Colour)parallel to the other optionsThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ohh good point
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
would it be out of scope to subtype them? otherwise they'll be named centcom official/centcom commander envirogloves by default ingame