Upstream Merge #84
Merged
Upstream Merge #84
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
# Description This PR adds a few articles of various kinds of religious headgear to loadouts, namely a Hijab, Turban, and Kippah. All 3 are whitescale items that are set as colorable, allowing players to make them whatever color is desired. Farida can finally have the pink Hijab she was always supposed to have. <details><summary><h1>Media</h1></summary> <p>  </p> </details> # Changelog :cl: - add: Added various articles of religious headgear to loadouts, such as Hijab, Kippah, and Turban. All of these are set to allow custom colors.
This is an automated Pull Request. This PR updates the GitHub contributors in the credits section. Co-authored-by: SimpleStation Changelogs <[email protected]>
# Description This PR adds several Xml documents, to be included as supplementary lore that can be linked to by Loadout entries, particularly ones that make reference to a specific corporation. This also includes a document for Security weapons, which clarifies their usage to players. Additionally, this fixes an issue with Loadouts, whereby because of the use of string-matching, it wasn't possible for more than one loadout item to share a guidebook. Instead, Loadouts can now directly declare a specific guidebook to link to. # TODO Add lore for the following: - [x] Einstein Engines - [x] Idris Incorporated - [x] Stellar Corporate Conglomerate - [x] NanoTrasen - [x] Orion Express - [x] Zeng-Hu Pharmaceuticals - [x] Hephaestus Heavy Industries - [x] Zavodskoi Interstellar - [x] Private Military Contracting Group <details><summary><h1>Media</h1></summary> <p>  </p> </details> # Changelog :cl: - add: Added a guidebook entry on Security Duty Weapons - add: Added guidebook entries on various Corporations in lore, such as Einstein Engines, Hephaestus Heavy Industries, etc. - add: Loadouts can now link to a specific guidebook entry via prototype ID.
# Description Adds **38** new earrings, **31** new face markings, and **16** bracelet/watch markings, based from Aurorastation cosmetics. Each earring, bracelet, and watch marking is applied to just one side of the body, allowing for greater customizability and mixing-and-matching markings. Most notably, the new face markings unlock **full customization of every pixel** in the 5x4 pixel space of the face. Examples of this are shown below. Arachne now have access to **more than a hundred** markings above the leg, after not having any markings in their 2 years of existence. ## Media ### Pauline <img height=270px src="https://github.com/user-attachments/assets/8316effb-34b3-4fa1-a80f-af2a3cd670c2"> <img height=270px src="https://github.com/user-attachments/assets/be75770a-c5bb-46a7-afb4-2ec54bd5a5e5"> **Head (Side):** Drop Earrings (Left), Drop Earrings (Right) **Left Hand:** Left Bracelet ### Red and Blue <img height=270px src="https://github.com/user-attachments/assets/8c1356fc-6eaa-484f-afb6-5ace7f45d895"> **Head:** Cheek Spot (Left), Eye Corner (Left), Cheek Spot (Right), Eye Corner (Right) **Head (Side):** Double Gemstone Earrings (Left), Double Gemstone Earrings (Right) **Left Hand:** Left Watch (Colorable) **Left Arm:** Left Arm Bracelet **Right Hand:** Right Watch (Colorable) **Right Arm:** Right Arm Bracelet ### Pink <img height=270px src="https://github.com/user-attachments/assets/ae376cc3-7cd5-4e91-a3a0-ebe48202f5e6"> **Head (Side):** Hoop Earrings (Left), Double Gemstone Earrings (Right) **Left Hand:** Left Bracelet **Left Arm:** Left Arm Bracelet **Right Hand:** Right Bracelet **Right Arm:** Right Arm Bracelet ### Psychic <img height=270px src="https://github.com/user-attachments/assets/eaa8069a-2e51-4456-a315-414aa64cd41a"> **Head:** Bindi, Full Blush **Head (Side):** Long Crystal Earrings (Left), Long Crystal Earrings (Right) **Left Hand:** Left Bracelet **Right Hand:** Right Bracelet **Right Arm:** Right Arm Bracelet ### Cyclops <img height=270px src="https://github.com/user-attachments/assets/55e67db9-0aa4-488d-a25b-32e8fd92044b"> **Head [Eyes]:** Bindi, Glabella, Nose Tape **Head [Cover for mouth area]:** Lip Corner (Left), Lip Corner (Right), Cheek Spot (Left), Cheek Spot (Right), Lips **Head (Side):** Cross Earrings (Left), Cross Earrings (Right) ### 😂 <img height=270px src="https://github.com/user-attachments/assets/4001b95a-60e1-431c-8463-1e2904cf767a"> ### Arachne  **Head:** Left Arachne Eye, Right Arachne Eye, Lips, Neck Cover (Slim Thick) **Head (Side):** Long Crystal Earrings (Left), Long Crystal Earrings (Right) **Left Arm:** Left Robotic Arm from Hesphiastos Industries **Left Hand:** Left Robotic Arm from Bishop Cybernetics **Right Arm:** Right Arm Bracelet **Right Hand:** Right Watch (Colorable), Right Nail Polish ## Technical Details I did a quick fix in [MarkingsSet.cs](https://github.com/Simple-Station/Einstein-Engines/compare/master...angelofallars:Einstein-Engines:fashion-update-markings?expand=1#diff-54373833c74b35579f9b3293d5bb0c17eda0d214c11f27dcb40c334ef8c6b513) to handle a list index out of bounds error where the number of default markings was lower than the maximum allowed markings, like with Onis who have a default horn but can wear 2 earrings. # 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: Skubman - add: 80+ new markings have arrived, including earrings, makeup, bracelets, and watches. Sashay over to Character Setup to personalize your character like never before! - add: The Arachne species can now select markings above the leg, including cybernetics, makeup, tattoos, noses, earrings, heterochromia, bracelets, gauze, and more! - tweak: The available points for Head (Side), Left Hand, and Right Hand markings have been increased for most species to support the new markings. - tweak: The Nail Polish markings have been moved from the Overlay category to the Left Hand and Right Hand categories.
# Description Adds the ability for Arachne to be male. Also in this I added chest/arm Arachnid markings for Arachne to use. I enabled footstep sounds for Arachne since it doesn't seem that they were intended to have silent footsteps. ## Media <img height=160px src="https://github.com/user-attachments/assets/04e3b066-e75c-4ee7-bfd6-762c2defcaf8"> <img height=160px src="https://github.com/user-attachments/assets/d4582c12-72d8-413f-92e6-145cb90c76c3"> ## Changelog :cl: Skubman - add: Arachne can now be Male instead of only being Female. They can now also wear Facial Hair. - add: Arachne can use Arachnid chest and arm markings. - fix: Arachne will now have footstep sounds instead of being quiet when moving.
<!-- 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]? --> Adds localization for the Senior Engineer and Senior Physician roles that were recently enabled. --- # TODO <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> n/a --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>   </p> </details> --- # 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: zelezniciar - fix: Fixed Senior Engineer and Physician names not appearing correctly
# Description Fixes cultist constructs only speaking Universal and not being able to understand anyone else due to a missing `LanguageKnowledgeComponent`. ## Changelog :cl: Skubman - tweak: Cultist constructs and soul shards now speak Tau-Ceti Basic and Eldritch. Co-authored-by: sleepyyapril <[email protected]>
|
RSI Diff Bot; head commit 0c0e6ea merging into 6fad416 Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi
Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Crystal_Thistle.rsi
Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi
Resources/Textures/Floof/Objects/Consumable/Food/icecream.rsi
Resources/Textures/Floof/Objects/Specific/Hydroponics/anomaly_berry.rsi
Resources/Textures/Floof/Objects/Specific/Hydroponics/blue_pumpkin.rsi
Resources/Textures/Floof/Objects/Specific/Hydroponics/capfruit.rsi
Resources/Textures/Floof/Objects/Specific/Hydroponics/cherry.rsi
Resources/Textures/Floof/Objects/Specific/Hydroponics/extradimensional_orange.rsi
Resources/Textures/Floof/Objects/Specific/Hydroponics/golden_apple.rsi
Resources/Textures/Floof/Objects/Specific/Hydroponics/holymelon.rsi
Resources/Textures/Floof/Objects/Specific/Hydroponics/meatwheat.rsi
Resources/Textures/Floof/Objects/Specific/Hydroponics/papercane.rsi
Resources/Textures/Floof/Objects/Specific/Hydroponics/plant_bag_holding.rsi
Resources/Textures/Floof/Objects/Specific/Hydroponics/tea_plant.rsi
Resources/Textures/Floof/Objects/Specific/Hydroponics/world_pea.rsi
Resources/Textures/Mobs/Customization/earrings.rsi
|
….yml Co-authored-by: FoxxoTrystan <[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.
Description
Adds: