Skip to content
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

Neptune Sock Submition #815

Conversation

Neptune-Zvezda
Copy link

About the PR

Added New clothing in the form of striped socks to both the pride vendor as well as too multiple Job-drobes

Why / Balance

People Desired and request the drip of socks, so I'm Attempting to Provide

Technical details

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

Current balance changes include a adjustment to the price of the pride vendor restock to 1300 as the addions in it increase its value, this is to avoid being able to make profit by reselling bought restock crates
Current version does not have "captain" socks within the Locker as the Limit of 30 items was reached, Potential solutions include a captain drobe to move most extra clothing out of locker to clear for needed items, Alternitively adding all "socks" too their own custom Sock Vending Machine and custom Cargo Crates may work best as they are purely vanity.
Plans to Add Some Functional Sock variants Like No slips for Janitor and perhaps a storage for Sec designs for a knife

Fix: Updated in new PR for the wisden merge
Tweak: Socks for heads shall be moved to their wardrobes
Removed: a desire to die

Neptune-Zvezda and others added 30 commits December 20, 2023 01:09
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
i forgot to add DeltaV to parka sprite code
Thank you colin!

Co-authored-by: Colin-Tel <[email protected]>
Signed-off-by: Neptune <[email protected]>
im fixing the Names of "Equip-FEET" to not be capitialized
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
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
Neptune-Zvezda and others added 17 commits December 28, 2023 17:29
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
@github-actions github-actions bot added S: Needs Review Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Merge Conflict Fix your PR! labels Feb 11, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Copy link
Contributor

github-actions bot commented Feb 11, 2024

RSI Diff Bot; head commit f292ca7 merging into cc8e8d8
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Clothing/Under/Socks/coder.rsi

State Old New Status
equipped-FEET Modified
icon Modified

Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/NParka.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedCaptainBlueandGold.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedCaptainBlueandWhite.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedCaptainGoldandBlue.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedCargo.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedCargoQm.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedEngineering.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedEngineeringAtmos.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedScience.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedSecurity.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedSecurityJackboots.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedWhiteandGreen.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedWhiteandLightBlue.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedWhiteandLightBlueBunnySlipper.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedWhiteandOrange.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedWhiteandPurple.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedWhiteandRed.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedWhiteandYellow.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/DeltaV/Clothing/Under/Socks/ClothingUnderSocksStripedYellowandPurple.rsi

State Old New Status
equipped-FEET Added
icon Added

Edit: diff updated after f292ca7

Disabled Socks From Head Lockers
@deltanedas
Copy link
Member

this should use prefixes instead of 10000 rsis

Copy link
Contributor

@DebugOk DebugOk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could all be a single RSI

@DebugOk
Copy link
Contributor

DebugOk commented Mar 15, 2024

Closing as stale

@DebugOk DebugOk closed this Mar 15, 2024
@DebugOk DebugOk added the S: Derelict Has not been active for a while label Mar 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Derelict Has not been active for a while S: Merge Conflict Fix your PR! S: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants