Upstream merge 28 jan #794
Draft
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
…2320) Make small clamp user 2% battery instead of recharge 2% battery. Co-authored-by: JIPDawg <[email protected]>
* Wires ui tooltip localization * Corrections after review
* Initial commit * Minor update
…114) Initial commit
Layout would break for machines with >6 lights because the column count was hardcoded. Uncap the UI width and fix the rows count instead. Lights with less than 4 characters of text weren't aligned right, now they are.
* Buffs crayons to 45 uses * Update Resources/Prototypes/Entities/Objects/Fun/crayons.yml Co-authored-by: slarticodefast <[email protected]> --------- Co-authored-by: slarticodefast <[email protected]>
Co-authored-by: plykiya <[email protected]>
* Improve crayon UI to not be stuck in 1996 * Make a horrifying crayon spaghetti * Crayon * Undeprecate the crayon, describe the crayon
* Initial commit * Corrected a field attribute
move borg ui junk to shared
# Description Arachne can now stand up after lying down again. ## Media Arachne with 8 registered legs lying down and standing up https://github.com/user-attachments/assets/b7b5c83b-b741-4d4f-88b6-1133834104de ## Technical Details I don't even really understand what I'm about to say, just trying to explain the issue for documentation purposes. `LayingDownSystem.TryStandUp` checks if the entity's `BodyComponent.LegEntities` element count is less than `BodyComponent.RequiredLegs`, which for Arachne is 8. https://github.com/Simple-Station/Einstein-Engines/blob/78347d76fb50908888c77df5e3b935b773297620/Content.Shared/Standing/SharedLayingDownSystem.cs#L141-L151 However, due to some issues with the part slot naming, `BodyComponent.LegEntities` for Arachne has no elements, because of Shitmed being hardcoded and being built with the expectation that all slot IDs start with "{body part symmetry} {part type}" like "left leg" and "right leg", from `GetSlotFromBodyPart`. This means that Arachne legs which were not following the format were not registered after being inserted into the thorax part's container. https://github.com/Simple-Station/Einstein-Engines/blob/78347d76fb50908888c77df5e3b935b773297620/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs#L1044-L1060 This is where the function is used: https://github.com/Simple-Station/Einstein-Engines/blob/78347d76fb50908888c77df5e3b935b773297620/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs#L216-L236 For the left foreleg for example, the container ID (`slotId`) is `body_part_slot_right foreleg` but the result of `PartSlotContainerIdPrefix + GetSlotFromBodyPart(part)` is `body_part_slot_right leg`, and slotId does not contain `right leg` so the check fails. This is resolved by renaming `left foreleg` to `left leg (fore)`, `right hind leg` to `right leg (hind)` , so on and so forth. For unconventional body parts like a thorax, you need to explicitly set the `BodyPart.SlotId` field to override `GetSlotFromBodyPart` returning `other`, when it should return `thorax` to pass the slotId check. This will make sure the thorax is registered and thus can recursively register the legs attached to it. ## Changelog :cl: Skubman - fix: Arachne can now stand up after lying down.
<!-- 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 --> # 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: Added a popup for when the UI cannot be open due to the maintenance panel being closed. - fix: Fixed Ripley control panel. - fix: Fixed Ripley giving battery instead of taking. - fix: Hopefully fixed wire light not appearing. - fix: Fixed crayons not placing the decal you want. - fix: Fixed bloodred boots not acting as a jetpack or magboots. - fix: Fixed voicemask chameleon menu. - fix: Fixed spawnpoint issues. (hopefully) - tweak: The crayons menu now has letters and numbers always next to each other, sorted. - tweak: Crayon UI has been improved, including a search feature.
…m Wizden (#1552) # Description Ports over these commits from Wizden: space-wizards/space-station-14@32e315c space-wizards/space-station-14@8d015f5 Namely the first is a general refactor to LightBehaviorSystem and the second is a bugfix that fixes some looping behaviors like the low battery effect on a flashlight never stopping. If it's not atomic enough, let me know and I can separate them into two. # Changelog :cl: - fix: Fixed some errors with looping behaviors like jitter.
i probably missed a few but someone better than me with markings can fix 'em later --------- Signed-off-by: Skubman <[email protected]> Signed-off-by: sleepyyapril <[email protected]> Co-authored-by: Lyndomen <[email protected]> Co-authored-by: Skubman <[email protected]> Co-authored-by: ElusiveCoin <[email protected]>
simplify this shitcode i borked it last time, sorry --------- Signed-off-by: sleepyyapril <[email protected]> Co-authored-by: VMSolidus <[email protected]>
This is an automated Pull Request. This PR updates the GitHub contributors in the credits section. Co-authored-by: SimpleStation Changelogs <[email protected]> Co-authored-by: stellar-novas <[email protected]>
I Hate Pacifist Mantises # Description This PR literally just removes the ability of the Mantis to be a pacifist. He's given a gun and a knife for a reason, his job is a violent one, makes no sense that he should be able to be a pacifist. --- # TODO - [x] Disable pacifism for the Mantis --- # Changelog :cl: ShirouAjisai - tweak: Mantis can no longer be a pacifist Co-authored-by: ShirouAjisai <[email protected]>
# Description Blueshield gets the same CPR trait that doctors and the Corpsman get. SOP says he's responsible for first aid on command so this reflects that. Plus, wouldn't it make sense for a highly-trained bodyguard to know basic CPR??? --- # TODO - [x] Give BSO the CPR trait # Changelog :cl: ShirouAjisai - add: Blueshield Officer now has CPR as a roundstart trait. --------- Signed-off-by: SixplyDev <[email protected]> Co-authored-by: ShirouAjisai <[email protected]> Co-authored-by: sleepyyapril <[email protected]>
🆑 - fix: Other species can pick Cataloguer, Psionic Mantis, and Mystagogue again.
# Description This PR prevents heads of staff and security members from having foreigner traits, muted trait, blindness trait, and pacifist trait (only HoS & Cap cannot be pacifist). These traits are major disabilities and actively detrimental to their departments & the rest of command staff if they have them. These traits make them unable to clearly and effectively communicate or render them unable to do a critical part of their jobs in the case of pacifist and muted. --- # TODO - [x] Security Department can no longer have pacifist, muted, blind, brittle bone disease, or foreigner traits. - [x] Head of Security can no longer have pacifist, muted, blind, brittle bone disease, or foreigner traits. - [x] Heads of staff can no longer have muted, blind, or foreigner traits. - [x] The Captain can no longer have pacifist, muted, blind, brittle bone disease, or foreigner traits. - [x] Head of Personnel can no longer have muted, blind, or foreigner traits. --- # Changelog :cl: ShirouAjisai - tweak: Security Department can no longer have pacifist, muted, blind, brittle bone disease, or foreigner traits. - tweak: Head of Security can no longer have pacifist, muted, blind, brittle bone disease, or foreigner traits. - tweak: Heads of staff can no longer have muted, blind, or foreigner traits. - tweak: The Captain can no longer have pacifist, muted, blind, brittle bone disease, or foreigner traits. - tweak: The Head of Personnel can no longer have muted, blind, or foreigner traits. --------- Signed-off-by: SixplyDev <[email protected]> Co-authored-by: ShirouAjisai <[email protected]> Co-authored-by: sleepyyapril <[email protected]>
# Description - Added the `SkeletonAccent` trait to the `TraitsAccents` item group prototype (was mistakenly not included) - Set all plasma tank's output pressure to 5.325 (was 21.3), same as the smaller plasma internals tank - Apparently the Output Pressure is not really meaningful for engineering on plasma tanks so this is just a QoL feature for plasmamen - Prevent plasmamen from taking the Temperature Tolerance trait that is useless due to their cold immunity. - Fix price of uplink mechs due to lack of Goob-Station/Goob-Station#332 - We absolutely want to bring the Telecrystal Rework here, but for now reduce the price Pending Rework™. - space-wizards/space-station-14#30393 (cherry-picked from Wizden) - Disable the Raise Glimmer objective due to the glimmer rework. ## Media **Plasma Tank Output Pressure** <img width=300px src="https://github.com/user-attachments/assets/4632a93d-25b9-4b16-b941-d7d2b39c2d77"> **Uplink Mechs** <img width=300px src="https://github.com/user-attachments/assets/6494d693-ca01-497d-a1bf-784058ffc1f6"> # Changelog :cl: Skubman - tweak: All plasma tanks of all kinds now have the correct output pressure for use as Plasmamen internals. - tweak: Plasmamen can no longer select the Temperature Tolerance trait which has no effect since they are already immune to Cold damage. - fix: Reduced the price of mechs on the uplink. - fix: Thief game rule now properly selects more than one thief. - remove: Remove the Raise Glimmer To 500 traitor objective. --------- Co-authored-by: Plykiya <[email protected]> Co-authored-by: plykiya <[email protected]>
# Description Adds the Ghost Bar from Goob LRP. Upon spawn, the character's loadouts and traits will also be applied as if their job was their Ghost Bar job. Adjusts the weights for kill objectives, re-enabling the kill objective and reducing the weight of Teach a Lesson now that there's more things to do after getting round removed. Goobstation cherry-picked PRs: - Goob-Station/Goob-Station#454 - Goob-Station/Goob-Station#464 - Goob-Station/Goob-Station#689 (partially applied to Ghost bar files only) - Goob-Station/Goob-Station#963 - Goob-Station/Goob-Station#974 - Goob-Station/Goob-Station#982 (partially applied to Ghost bar files only) - Goob-Station/Goob-Station#1288 (partially applied to Ghost bar files only) Wizden cherry-picked PRs: - space-wizards/space-station-14#29103 (for the foam force rifle that spawns in the Ghost bar) ## Media **Ghost Bar UI**  **Ghost Bar In-Game**  Notice how the Ghost Bar character has loadout items in the backpack and the Skeleton Accent trait. ## 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: Ghost Bar! When you die, you can now go to the Ghost Bar to chill and talk about the round with other ghosts. (by Aidenkrz) - add: Foam Force rifle to cargo lottery! (by IProduceWidgets) - add: Re-enabled the Kill objective for traitors. - tweak: Reduced the chances of traitors getting the "Teach a Lesson" objective. --------- Co-authored-by: Aiden <[email protected]> Co-authored-by: Rank #1 Jonestown partygoer <[email protected]> Co-authored-by: IProduceWidgets <[email protected]> Co-authored-by: Aviu00 <[email protected]>
ver 0.1 no longer Co-authored-by: Milon <[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.
DO NOT SQUASH MERGE
Fixes bugs with audio and menu