Clothing Additions #135
Closed
Clothing Additions #135
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
… into Clothing-Additions
- Added Pink Hoodie to Loadouts - Added in more Departmental socks, warmers, & thongs - Added various stats to the respective department pieces - Added requested Outwear, Overalls Signed-off-by: Dakota Haven <[email protected]>
- Added Mantis, and Courier socks ect - Added the skirt tag, thongs can be worn by harpies (Someone already did, but didn't want to accidentally revert any changes) - Added Cyberjackets Signed-off-by: Dakota Haven <[email protected]>
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
Status: Merge Conflict
|
RSI Diff Bot; head commit d731a88 merging into 858fd60 Resources/Textures/Floof/Clothing/Departmental/Engineering/chiefengisocks.rsi
Resources/Textures/Floof/Clothing/Departmental/Engineering/chiefengithong.rsi
Resources/Textures/Floof/Clothing/Departmental/Engineering/chiefengiwarmer.rsi
Resources/Textures/Floof/Clothing/Departmental/Epistemics/directorepisocks.rsi
Resources/Textures/Floof/Clothing/Departmental/Epistemics/directorepithong.rsi
Resources/Textures/Floof/Clothing/Departmental/Epistemics/directorepiwarmer.rsi
Resources/Textures/Floof/Clothing/Departmental/Epistemics/mantisepisocks.rsi
Resources/Textures/Floof/Clothing/Departmental/Epistemics/mantisepithong.rsi
Resources/Textures/Floof/Clothing/Departmental/Epistemics/mantisepiwarmer.rsi
Resources/Textures/Floof/Clothing/Departmental/Logistics/mailcarriersocks.rsi
Resources/Textures/Floof/Clothing/Departmental/Logistics/mailcarrierthong.rsi
Resources/Textures/Floof/Clothing/Departmental/Logistics/mailcarrierwarmer.rsi
Resources/Textures/Floof/Clothing/Departmental/Logistics/qmlogisocks.rsi
Resources/Textures/Floof/Clothing/Departmental/Logistics/qmlogithong.rsi
Resources/Textures/Floof/Clothing/Departmental/Logistics/qmlogiwarmer.rsi
Resources/Textures/Floof/Clothing/Departmental/Medical/chemistsocks.rsi
Resources/Textures/Floof/Clothing/Departmental/Medical/chemistthong.rsi
Resources/Textures/Floof/Clothing/Departmental/Medical/chemistwarmer.rsi
Resources/Textures/Floof/Clothing/Departmental/Medical/cmosocks.rsi
Resources/Textures/Floof/Clothing/Departmental/Medical/cmothong.rsi
Resources/Textures/Floof/Clothing/Departmental/Medical/cmowarmer.rsi
Resources/Textures/Floof/Clothing/Departmental/Medical/paramedsocks.rsi
Resources/Textures/Floof/Clothing/Departmental/Medical/paramedthong.rsi
Resources/Textures/Floof/Clothing/Departmental/Medical/paramedwarmer.rsi
Resources/Textures/Floof/Clothing/Departmental/Security/detectsocks.rsi
Resources/Textures/Floof/Clothing/Departmental/Security/detectthong.rsi
Resources/Textures/Floof/Clothing/Departmental/Security/detectwarmer.rsi
Resources/Textures/Floof/Clothing/Departmental/Security/hossocks.rsi
Resources/Textures/Floof/Clothing/Departmental/Security/hosthong.rsi
Resources/Textures/Floof/Clothing/Departmental/Security/hoswarmer.rsi
Resources/Textures/Floof/Clothing/Departmental/Service/bartendersocks.rsi
Resources/Textures/Floof/Clothing/Departmental/Service/bartenderthong.rsi
Resources/Textures/Floof/Clothing/Departmental/Service/bartenderwarmer.rsi
Resources/Textures/Floof/Clothing/Departmental/Service/chefsocks.rsi
Resources/Textures/Floof/Clothing/Departmental/Service/chefthong.rsi
Resources/Textures/Floof/Clothing/Departmental/Service/chefwarmer.rsi
Resources/Textures/Floof/Clothing/Departmental/Service/musiciansocks.rsi
Resources/Textures/Floof/Clothing/Departmental/Service/musicianthong.rsi
Resources/Textures/Floof/Clothing/Departmental/Service/musicianwarmer.rsi
Resources/Textures/Floof/Clothing/Departmental/Service/universalservicejumpsuit.rsi
Resources/Textures/Floof/Clothing/OuterClothing/Misc/plainoveralls.rsi
Resources/Textures/Floof/Clothing/OuterClothing/Misc/robooveralls.rsi
Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/cyberjacketpurple.rsi
Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/cyberjacketwhite.rsi
Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/cyberjacketyellow.rsi
Resources/Textures/Floof/Clothing/Uniforms/musicianking.rsi
Resources/Textures/Floof/Clothing/Uniforms/musiciankingblack.rsi
|
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.
Description
Added in some more departmental socks, and a few other requested outfits. Did a few bug fixes.
TODO
Currently finished
Changelog