test #738
Closed
test #738
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
This is suffering
Should be all working but fact check it
Moved Items to Delta V Directory as well as condensing into singular Yml files
removed all _ from names of files and reading
Moved all Department Themed Socks to respective __-drobes Certain socks to Department Head Lockers Last todo's Fix Image Sizes ( to be done) add standard socks to certain random spawn pools
For real fixed the icons this time however test enviroment server was acting extremely unstable with ajustment of the Yml's from \ Backslashes to / forward slashes to match existing file formating
Removed " " from Json's around coder socks as could have been causing issues as well as syncing inventory with master due to new winter boot addions
Adjusted Json to follow Requested Copyright More Closely
Refixed Pride Vendor stock as seemed to have forgotten to save changes in the past, Renamed the Logi Socks to not include a - to avoid errors Renamed Atmos Socks to have correct spelling of engineering on Files and yml Remembered to Add the Qm's Socks to Locker
Signed-off-by: Neptune <[email protected]>
i forgot to add DeltaV to parka sprite code
…e-Zvezda/Delta-v-Nep-fuckery into Neptune-Outfit-Submitions
Thank you colin! Co-authored-by: Colin-Tel <[email protected]> Signed-off-by: Neptune <[email protected]>
…ks.yml Co-authored-by: Colin-Tel <[email protected]> Signed-off-by: Neptune <[email protected]>
…e-Zvezda/Delta-v-Nep-fuckery into Neptune-Outfit-Submitions
im fixing the Names of "Equip-FEET" to not be capitialized
death
undeath
adjust price
Updated N parka to move sleeves one pixel in as well as fixing a stray pixel on the front view
Adjusted all Item Id to include ClothingUnder as to standardise for researching, Socks Should now be eatable by moffs N parka now has storage
Signed-off-by: Neptune <[email protected]>
Fixed ID Name in Medidrobe as was not updated with ClothingUnder like other drobes
Patched N parka and atmos socks to have correct Id in Yml's to match other items
Updated N parka Names to not Include _'s to standardize naming
Changed Sock .Yml EngineeringAtmos to be / and not \ (got to read update with rename of folder)
Finally Noticed Socks was in the Id Name for Atmos Socks Twice
Captain's locker was too filed to fit the socks, moved to pride vendor until futher ideas
Socks Moved From captain locker were not given a amount to be stocked with.
Adjusted Cost of pride restock as with addion of "captain" socks went over the cost limit
…k.yml Co-authored-by: Colin-Tel <[email protected]> Signed-off-by: Neptune <[email protected]>
…k.yml Co-authored-by: Colin-Tel <[email protected]> Signed-off-by: Neptune <[email protected]>
…k.yml Co-authored-by: Colin-Tel <[email protected]> Signed-off-by: Neptune <[email protected]>
…k.yml Co-authored-by: Colin-Tel <[email protected]> Signed-off-by: Neptune <[email protected]>
…k.yml Co-authored-by: Colin-Tel <[email protected]> Signed-off-by: Neptune <[email protected]>
…k.yml Co-authored-by: Colin-Tel <[email protected]> Signed-off-by: Neptune <[email protected]>
…k.yml Co-authored-by: Colin-Tel <[email protected]> Signed-off-by: Neptune <[email protected]>
…k.yml Co-authored-by: Colin-Tel <[email protected]> Signed-off-by: Neptune <[email protected]>
…k.yml Co-authored-by: Colin-Tel <[email protected]> Signed-off-by: Neptune <[email protected]>
…k.yml Co-authored-by: Colin-Tel <[email protected]> Signed-off-by: Neptune <[email protected]>
…e-Zvezda/Delta-v-Nep-fuckery into Neptune-Outfit-Submitions
github-actions
bot
added
S: Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
RSI Diff Bot; head commit b388b99 merging into fa88a26 Resources/Textures/Clothing/Under/Socks/coder.rsi
Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/NParka.rsi
Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedCaptainBlueandGold.rsi
Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedCaptainBlueandWhite.rsi
Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedCaptainGoldandBlue.rsi
Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedCargo.rsi
Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedCargoQm.rsi
Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedEngineering.rsi
Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedEngineeringAtmos.rsi
Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedScience.rsi
Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedSecurity.rsi
Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedSecurityJackboots.rsi
Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedWhiteandGreen.rsi
Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedWhiteandLightBlue.rsi
Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedWhiteandLightBlueBunnySlipper.rsi
Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedWhiteandOrange.rsi
Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedWhiteandPurple.rsi
Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedWhiteandRed.rsi
Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedWhiteandYellow.rsi
Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedYellowandPurple.rsi
|
Signed-off-by: Danger Revolution! <[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.
About the PR
Why / Balance
Technical details
Media
Breaking changes
Changelog