-
Notifications
You must be signed in to change notification settings - Fork 165
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
More Colorable Items #1365
Merged
VMSolidus
merged 1 commit into
Simple-Station:master
from
VMSolidus:more-colorable-items
Dec 21, 2024
Merged
More Colorable Items #1365
VMSolidus
merged 1 commit into
Simple-Station:master
from
VMSolidus:more-colorable-items
Dec 21, 2024
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
github-actions
bot
added
Changes: Localization
Changes any ftl files
Changes: YML
Changes any yml files
Changes: Sprite
Changes any png or json in an RSI
labels
Dec 21, 2024
RSI Diff Bot; head commit 7ac00c9 merging into cd5a6f8 Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi
Resources/Textures/Clothing/Head/Bandanas/white.rsi
Resources/Textures/Clothing/Head/Hats/beretwhite.rsi
|
sleepyyapril
approved these changes
Dec 21, 2024
Remuchi
approved these changes
Dec 21, 2024
VMSolidus
pushed a commit
to VMSolidus/Einstein-Engines
that referenced
this pull request
Dec 21, 2024
angelofallars
added a commit
to SpaciousStation14/SpaciousStation14Archive
that referenced
this pull request
Dec 25, 2024
* v237.3.0 (Simple-Station#1354) the robust toolbox updater!! https://github.com/space-wizards/RobustToolbox/blob/v237.3.0/RELEASE-NOTES.md * Hotfix Saltern (Simple-Station#1359) # Description Small maintenance to do. Bridge needed FixGridAtmos done, and a single light in dorms needed wiring. # Changelog :cl: - fix: Fixed the Saltern bridge being a hard vacuum at roundstart. * Automatic Changelog Update (Simple-Station#1359) * Loadouts Debloating (Colorable Items) (Simple-Station#1364) # Description This PR cuts down significantly on Loadouts bloat by removing all specific color versions of colorable items from the loadouts. I left the original items untouched for compatibility reasons since certain things in the game still need to be able to spawn a "Blue jumpsuit" etc. Additionally, to help aid in clarity for players, I've added localizations for all the generic colorable items so that they have (colorable) in the loadout names, so that players can tell which items have the option without needing to click into the customize button on every item. <details><summary><h1>Media</h1></summary> <p> ![image](https://github.com/user-attachments/assets/7ab30002-c7d4-4eeb-b018-45a9fda80ae6) </p> </details> # Changelog :cl: - add: Added labels to all generic colorable items in loadouts, so that players can see which items have custom colors as customization options. - remove: Removed all 'specific color' variants of colorable items from Loadouts, such as "Blue Jumpsuit" when a colorable jumpsuit exists. * Automatic Changelog Update (Simple-Station#1364) * More Colorable Items (Simple-Station#1365) # Description This PR adds even more colorable items to loadouts, this time making entirely new whitescale versions of existing items that did not have one previously. This replaces several more options for items that had a whole bunch of specific color entries with a single item that can take any color. <details><summary><h1>Media</h1></summary> <p> ![image](https://github.com/user-attachments/assets/31438bf7-6ca3-45d2-bf10-af5db5f6e4c4) </p> </details> # Changelog :cl: - add: Added colorable variants of fingerless gloves, headbands, berets, hairflowers, cloth masks, and the neck gaiter. * Automatic Changelog Update (Simple-Station#1365) * Make the EE Logo Match the Banner (Simple-Station#1361) # Description Light mode logo * Loadout Modular Functions (And Loadout Pets) (Simple-Station#1366) # Description This PR implements a reflection based system for applying functions directly to entities spawned by loadouts. In order to provide an "Example" use of this system, I have created a "LoadoutMakeFollower" function, which can be applied to a loadout entity that happens to be an NPC with the Follower blackboard, making it follow the player who purchased that loadout. Basically. Pet mouse. The pet mouse will follow its owner. Yes I actually have tested this ingame, and it works great. The longest part about coding this was me spending almost 30 minutes straight wondering why the mouse wasn't following my character, until I remembered that I had to make a special "Pet" mouse variant that had the right HTN root task. This could be extended to other things. I happen to know that Nuclear14 wanted something like this for a Pet Dog. <details><summary><h1>Media</h1></summary> <p> ![image](https://github.com/user-attachments/assets/a18b026b-07a3-4ad7-8cce-4ea4dc4c3036) </p> </details> # Changelog :cl: - add: Loadouts can now apply modular functions to items upon spawning in. - add: A new LoadoutMakeFollower function, which lets you buy NPC followers in loadouts. - add: added Pet Mice, Cockroach, Mothroach, and Hamster to Loadouts. All of which use the new LoadoutMakeFollower function. Co-authored-by: sleepyyapril <[email protected]> * Automatic Changelog Update (Simple-Station#1366) * Plushies! (Simple-Station#1369) <!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Added two new plushies to the game! A harpy plushie and a plushie for the beloved station pet Morty! ![image](https://github.com/user-attachments/assets/3e202da2-3571-4c67-82c9-54a6aaf3c91f) ![mortplush](https://github.com/user-attachments/assets/9f131eb9-ed89-4818-b54c-e9da949e8ce2) ![harpyplushie](https://github.com/user-attachments/assets/47aa5b91-0747-4a2c-8c5c-18c5429ab570) --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: two new cuddly friends to the station! (harpy and morty plush) --------- Signed-off-by: sleepyyapril <[email protected]> Co-authored-by: juniwoofs <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> Co-authored-by: sleepyyapril <[email protected]> * Automatic Changelog Update (Simple-Station#1369) * Traits System Anticheat (Simple-Station#1358) # Description It turns out that there was no system in place for serverside fact checking of whether or not people have a legal traits list. Last night a bug was reported whereby a player used Cheat Engine to give himself every trait in the game, bypassing the points system entirely. It's not actually possible to reduce a trait selection down to a legal list without creating interesting race conditions, which limits my options on how to deal with it. So I made it a vote on the Einstein Engines discord, and the vote was unanimous. PUNISH THE CHEATERS. <details><summary><h1>Media</h1></summary> <p> https://www.youtube.com/watch?v=X2QMN0a_TrA </p> </details> # Changelog :cl: - add: Implemented Anti-cheat for Traits. Attempting to join a round with an illegal traits list will result in hilarious consequences. * Automatic Changelog Update (Simple-Station#1358) * Make Prisoner Not Shitter Role (Simple-Station#1341) # Description Prisoner is consistently the most problematic role in this entire game, being seen as "The Self Antagging Role", which produces endless amounts of administrative burden. This is especially a problem with lowpop servers, or servers that are understaffed with admins. Players just join as Prisoner, *immediately* break out of the permabrig, and then go on a self antagging spree. The solution to this was staring us in the face the whole time. Just give them the same Pacified component that the Thief antag has. Now it's impossible for them to smash the permabrig windows, someone has to intentionally let them out, and even if they do, they will be hard pressed to selfantag when they can't turn on harm intent. # Changelog :cl: - add: Prisoners now spawn with a Pacifier Implant. * Automatic Changelog Update (Simple-Station#1341) * Fix Jittering (Simple-Station#1334) <!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Title. Ported from Fansana/floofstation1#393 Resolves Simple-Station#1277 --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - fix: Fixed jittering displacing your character when shaken. * Automatic Changelog Update (Simple-Station#1334) --------- Signed-off-by: sleepyyapril <[email protected]> Co-authored-by: sleepyyapril <[email protected]> Co-authored-by: VMSolidus <[email protected]> Co-authored-by: SimpleStation Changelogs <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]> Co-authored-by: juniwoofs <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Changes: Localization
Changes any ftl files
Changes: Sprite
Changes any png or json in an RSI
Changes: YML
Changes any yml files
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
This PR adds even more colorable items to loadouts, this time making entirely new whitescale versions of existing items that did not have one previously. This replaces several more options for items that had a whole bunch of specific color entries with a single item that can take any color.
Media
Changelog
🆑