upstream pull#4
Draft
ivomink wants to merge 3529 commits into
Draft
Conversation
#4270) ## Short description <!-- What do you propose to change with your PR? --> ## Why we need to add this <!-- What is the reason for adding these changes? Please post links to Discussions as well as Bug Reports here. Please describe how this will change the game balance. --> ## Media (Video/Screenshots) <!-- If your PR contains in-game changes you must provide screenshots/videos of the changes. --> ## Checks <!-- check boxes for faster reviewing of your PR --> - [x] I do not require assistance to complete the PR. - [x] Before posting/requesting review of a PR, I have verified that the changes work. - [x] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [x] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions.
## Short description Resomi now use Resomi metabolism for breathing ## Why we need to add this This was clearly intended to already be the case, there are gasses with filters for the Resomi metabolism type, but Resomi lungs do not *have* that type. ## Checks <!-- check boxes for faster reviewing of your PR --> - [x] I do not require assistance to complete the PR. - [x] Before posting/requesting review of a PR, I have verified that the changes work. - [x] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [x] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions. **Changelog** :cl: Citrea - fix: Resomi no longer get poisoned by ammonia gas.
## Short description Request of EVENT MANAGER Lyna ## Why we need to add this A pirate version of vodkazine ## Media (Video/Screenshots) NA ## Checks <!-- check boxes for faster reviewing of your PR --> - [x] I do not require assistance to complete the PR. - [x] Before posting/requesting review of a PR, I have verified that the changes work. - [x] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [x] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions. **Changelog** :cl: Scarlet Lightweaver - add: Added Rumizine for PIRATES.
## Short description Another set of balance changes based on player feedback - [x] modify the drinking efficiency from dead bodies based on level of rot - [x] Reduce the slowdown Vampires suffer from to it isn't so ruinous to be starving - [x] Tweak values of glare protections as considering the easy of getting flash protection, tiders are too safe ## Why we need to add this Balance changes that scale with conditions instead of being static. The better fed the vampire, the more dangerous they are along with a few other tweaks based on community feedback. ## Media (Video/Screenshots) <!-- If your PR contains in-game changes you must provide screenshots/videos of the changes. --> https://github.com/user-attachments/assets/cee773d4-cc35-4d27-8468-bcec18e57458 https://github.com/user-attachments/assets/49942206-88d4-43e8-92e3-0796953c6170 https://github.com/user-attachments/assets/fb9a7fe1-0bbd-41fa-af60-1421032e7f29 https://github.com/user-attachments/assets/8d03134d-60d5-4a4a-9940-a23bdeca7e14 ## Checks <!-- check boxes for faster reviewing of your PR --> - [x] I do not require assistance to complete the PR. - [x] Before posting/requesting review of a PR, I have verified that the changes work. - [x] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [x] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions. **Changelog** :cl: BornStellar - tweak: Drinking from dead now possible again, but is less efficient than drinking from the living. Rot reduces the efficiency further. - fix: Vampires don't gain full blood from bites that would drain a target below 0 blood, it now scales as would be expected. - tweak: flash protection from glare now scales with vampire level. Baby vamps are fully countered by flash protection while fully powered ones will stun for even longer. - tweak: starvation slowdown changed from 80% to 30%. <!-- - add: Added Starlight. - remove: Removed SS13. - tweak: Changed SS14. - fix: Fixed Rinary. --> --------- Co-authored-by: Rinary <rinary.super@gmail.com>
## Short description <!-- What do you propose to change with your PR? --> Follow-up for #4255 There was a second array of values that would throw an out-of-range error whenever there were gas sensors on pipe layers 4 or 5 and *sometimes* when gas pumps were on pipe layer 4 or 5. In `Content.Client\Atmos\Consoles\AtmosMonitoringConsoleWindow.xaml.cs` ```csharp private readonly Vector2[] _pipeLayerOffsets = { new Vector2(0f, 0f), new Vector2(0.25f, 0.25f), new Vector2(-0.25f, -0.25f) }; ``` This would throw this error: > [ERRO] system.user_interface: Caught exception while attempting to create a BUI key with type Content.Client.Atmos.Consoles.AtmosMonitoringConsoleBoundUserInterface on entity atmospheric network monitor (84017/n1147613, ComputerAtmosMonitoring). Exception: System.IndexOutOfRangeException: Index was outside the bounds of the array. at Content.Client.Atmos.Consoles.AtmosMonitoringConsoleWindow.AddTrackedEntityToNavMap(AtmosDeviceNavMapData metaData, Boolean isSensor) in /home/runner/work/space-station-14/space-station-14/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleWindow.xaml.cs:line 230 Which is referring to this line in `AddTrackedEntityToNavMap()` ```csharp if (proto.Placement == NavMapBlipPlacement.Offset && metaData.PipeLayer > 0) coords = coords.Offset(_pipeLayerOffsets[(int)metaData.PipeLayer]); ``` `_pipeLayerOffsets[(int)metaData.PipeLayer])` would go out of range out of the `_pipeLayerOffsets` array because it only has 3 entires and the `PipeLayer` enum has 5 entries. I've fixed this and another bug by adjusting the `_pipeLayerOffsets` array. ## Why we need to add this <!-- What is the reason for adding these changes? Please post links to Discussions as well as Bug Reports here. Please describe how this will change the game balance. --> It fixes two bugs: - The little sprites for stuff like gas pumps were misaligned with pipes (see Media). - The Network Monitor will soft-crash (throw an error and close the GUI) every time there is a gas pump or gas sensor on pipe layer 4 or pipe layer 5. ## Media (Video/Screenshots) <!-- If your PR contains in-game changes you must provide screenshots/videos of the changes. --> fig. 1 - **Before** this fix is applied. Note how the triangles (which represent gas pumps) are really offset from their pipes. <img width="732" height="573" alt="image" src="https://github.com/user-attachments/assets/69ca26e2-1465-4f73-89eb-8b13fdef0ef6" /> fig. 2 - **After** this fix was is applied. Note that the triangles align with their pipes much better. Also pictured are the gas sensors, correctly aligned with their pipes. <img width="1530" height="761" alt="image" src="https://github.com/user-attachments/assets/fa105069-a971-4495-a5d9-c43ed7bb4306" /> ## Checks <!-- check boxes for faster reviewing of your PR --> - [x] I do not require assistance to complete the PR. - [x] Before posting/requesting review of a PR, I have verified that the changes work. - [x] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [x] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions. **Changelog** <!-- If you want the players to know about changes made in this PR, specify them using the template outside the comment. Short and informative. :cl: STARLIGHT TEAM - add: Added Starlight. - remove: Removed SS13. - tweak: Changed SS14. - fix: Fixed Rinary. --> :cl: Caws - fix: Toggling on "Gas pipe sensors" in the Atmospheric Network Monitor no longer breaks the network monitor. Engineers rejoice, again. - fix: The triangle sprites that represent gas pumps on the Atmospheric Network Monitor now correctly align with their respective gas pipes again.
Several bug fixes, balancing and quality of life ## Short description <!-- What do you propose to change with your PR? --> (Oasis). Very small changes and fixes to item descriptions. (Lobster.) A Critical issue a security door had to be fixed. Also some artifact quality of life. (Orwell.) This started off as some very small bug fixes but bloated into a chem room expansion and ai nerf. ## Why we need to add this <!-- What is the reason for adding these changes? Please post links to Discussions as well as Bug Reports here. Please describe how this will change the game balance. --> Making ai reliant on station power has been a trend ive been adding to all of passes to make sure they are not completely self sufficient which on most stations (Orwell included) they were. Also i have been adding solitarys to gen pops on most of my passes. https://discord.com/channels/1272545509562777621/1476024086931964058 https://discord.com/channels/1272545509562777621/1493476535951298560 ## Media (Video/Screenshots) <!-- If your PR contains in-game changes you must provide screenshots/videos of the changes. --> ## Checks <!-- check boxes for faster reviewing of your PR --> - [x] I do not require assistance to complete the PR. - [x] Before posting/requesting review of a PR, I have verified that the changes work. - [ ] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [x] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions. **Changelog** <!-- If you want the players to know about changes made in this PR, specify them using the template outside the comment. Short and informative. :cl: STARLIGHT TEAM - add: Added Starlight. - remove: Removed SS13. - tweak: Changed SS14. - fix: Fixed Rinary. --> :cl: Cvlancer. - add: (LOBSTER) Scrubbers to artifact room with new air alarms. - tweak: (LOBSTER) Changed wired artifact maints to station to encourage maints scientist. - fix: (LOBSTER) Fixed brigmedic door not being locked. (oops). - add: (OASIS) Added tiles under the northern dock. - add: (OASIS) Added detective drobe to detectives office. - add: (OASIS) Added goliath cloak to the strange target at shooting range. - fix: (OASIS) Fixed engie substation, now it is wired so it doesn't lose power instantly near shift start. - fix: (OASIS) Fixed maints surgery bag item description. - fix: (OASIS) Fixed freds equipment descriptions. - fix: (OASIS) Fixed library maints door being engi locked instead of maints locked. - add: (ORWELL) Added botany tools to gen pop. - add: (ORWELL) Added solitary to gen pop. - add: (ORWELL) Added paper to medical. - add: (ORWELL) Added mixed colorful lights to theatre. - add: (ORWELL) Added plumbing area to chemist. - add: (ORWELL) Added fight club to medical maints. - remove: (ORWELL) Removed telecommunications server in rd server room. - remove: (ORWELL) Removed Some wooden barricades at viro making it slightly more appealing to use. - tweak: (ORWELL) Changed the theatre room to use the new platforms. - tweak: (ORWELL) Changed ai core to draw power from station and not be self sufficient. - tweak: (ORWELL) Changed outside ai core by removing cameras and adding layer another of reinforced walls. (2->3). - fix: (ORWELL) Fixed freezer in kitchen not being set to the correct tempature also made it activate at shift start. - fix: (ORWELL) Fixed a firelock that started closed at shift start. - fix: (ORWELL) Fixed dispo piping exit at disposals. - fix: (ORWELL) Fixed a gen pop window grille that could be broken by punching due to a bug.
## Short description Restores several removed loadout options ## Why we need to add this Towels were removed wizden-side for seemingly no reason, and maid outfits likewise (but on our end), so this PR restores both. Especially notable that some of the items in the fashion-o-matic exist *expressly and exclusively* because the maid outfits were moved fully into loadouts, where they belong. Not touching the mess with the medical loadout for now, as that is already being addressed (https://discord.com/channels/1272545509562777621/1498044933637013776) ## Media (Video/Screenshots) <img width="224" height="428" alt="image" src="https://github.com/user-attachments/assets/cb146337-cd24-489c-a444-1af23cfbdfe7" /> Service jobs get to bring maid outfits - and if you want to spend trinket slots on it you can <img width="505" height="713" alt="image" src="https://github.com/user-attachments/assets/b8c83a88-09e8-498c-a5b8-d0909a31112f" /> Towels exist again ## Checks <!-- check boxes for faster reviewing of your PR --> - [x] I do not require assistance to complete the PR. - [x] Before posting/requesting review of a PR, I have verified that the changes work. - [x] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [x] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions. **Changelog** :cl: Citrea - fix: Towels with colours exist again. - fix: Maid outfits are back in loadouts.
## Short description Quick construction didn't work on glass and rods, this fixes that. ## Why we need to add this quick fix ## Checks <!-- check boxes for faster reviewing of your PR --> - [X] I do not require assistance to complete the PR. - [X] Before posting/requesting review of a PR, I have verified that the changes work. - [X] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [X] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions.
## Short description <!-- What do you propose to change with your PR? --> Adds a monitor to help MedTak track down their clients on station, a common issue with playtests I have seen ## Why we need to add this <!-- What is the reason for adding these changes? Please post links to Discussions as well as Bug Reports here. Please describe how this will change the game balance. --> The death rattle has proved to be insufficient for quickly locating and securing clients Also moves all filtering logic (departmental, wounded/dead, tracking implants, factions) serverside First time dabbling in C# so criticism of my code (preferably constructive!) is quite welcome ## Media (Video/Screenshots) <!-- If your PR contains in-game changes you must provide screenshots/videos of the changes. --> <img width="160" height="160" alt="monitor" src="https://github.com/user-attachments/assets/f6b54de1-1fcd-4d75-a454-14dbf46b6752" /> ## Checks <!-- check boxes for faster reviewing of your PR --> - [x] I do not require assistance to complete the PR. - [x] Before posting/requesting review of a PR, I have verified that the changes work. - [x] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [x] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions.
## Short description <!-- What do you propose to change with your PR? --> Fixes Defibs not healing Asphyx. ## Why we need to add this <!-- What is the reason for adding these changes? Please post links to Discussions as well as Bug Reports here. Please describe how this will change the game balance. --> Bugfix ## Media (Video/Screenshots) <!-- If your PR contains in-game changes you must provide screenshots/videos of the changes. --> ## Checks <!-- check boxes for faster reviewing of your PR --> - [X] I do not require assistance to complete the PR. - [X] Before posting/requesting review of a PR, I have verified that the changes work. - [ ] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [X] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions. **Changelog** <!-- If you want the players to know about changes made in this PR, specify them using the template outside the comment. Short and informative. :cl: STARLIGHT TEAM - add: Added Starlight. - remove: Removed SS13. - tweak: Changed SS14. - fix: Fixed Rinary. --> :cl: CrazyPhantom - fix: Defibs will no longer randomly stop healing Asphyx Damage. Co-authored-by: Your Name <you@example.com>
…ns clean-up (#4446) ## Short description <!-- What do you propose to change with your PR? --> - Adds four new station beacons: NTR, BSO, Nuclear Reactor, and Xenobio. - Gives the "NCT Office" station beacon the command color. - Renamed some internal translation strings and suffixes on the station beacons to be a bit more clear for mappers. I also moved the "NCT Office" station beacon and "Lawyer" station beacon to the Starlight folders. The Lawyer beacon is new, not to be confused with the upstream "Law Office" beacon. ## Why we need to add this <!-- What is the reason for adding these changes? Please post links to Discussions as well as Bug Reports here. Please describe how this will change the game balance. --> - Organization is good. - Default station beacon prototypes are good for mappers. - Making stuff more clear for mappers is also good. - We needed a station beacon for the Nuclear Reactor for #4440 - We've needed a Xenobio station beacon for a while, but one never got added. ## Media (Video/Screenshots) <!-- If your PR contains in-game changes you must provide screenshots/videos of the changes. --> <img width="429" height="385" alt="image" src="https://github.com/user-attachments/assets/cbea9c3d-a35d-43d4-bf38-ada64cd62b02" /> fig. 1 - Station Beacons as seen in game. ## Checks <!-- check boxes for faster reviewing of your PR --> - [x] I do not require assistance to complete the PR. - [x] Before posting/requesting review of a PR, I have verified that the changes work. - [x] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [x] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions. **Changelog** <!-- If you want the players to know about changes made in this PR, specify them using the template outside the comment. Short and informative. :cl: STARLIGHT TEAM - add: Added Starlight. - remove: Removed SS13. - tweak: Changed SS14. - fix: Fixed Rinary. --> :cl: Caws - add: New station beacons have been added for mapping: NTR, BSO, Nuclear Reactor, and Xenobiology. --------- Co-authored-by: Rinary <rinary.super@gmail.com>
## Short description Imported numerous clothing items from DeltaV station and fixed a couple issues found during works ## Why we need to add this people love drip ## Media (Video/Screenshots) <img width="626" height="404" alt="Screenshot 2026-05-12 021710" src="https://github.com/user-attachments/assets/65c075f6-2ea8-47d6-96c8-bbb293136704" /> <img width="561" height="557" alt="Screenshot 2026-05-12 205309" src="https://github.com/user-attachments/assets/377cb853-171a-47f2-a35e-663d8818b642" /> <img width="500" height="355" alt="Screenshot 2026-05-13 172829" src="https://github.com/user-attachments/assets/8293ae6c-a19b-48da-9aba-739ec90b686e" /> ## Checks - [X] I do not require assistance to complete the PR. - [X] Before posting/requesting review of a PR, I have verified that the changes work. - [X] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [X] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions. **Changelog** :cl: - add: Added 49 new clothing items between cloaks, jumpsuits and coats. - fix: fixed ntr wig not showing up in the loadout preview and being equipped as outer clothing at round start.
## Short description <!-- What do you propose to change with your PR? --> The wiki team consistently uses "NanoTrasen" when spelling the company. The game uses a mix of both. It's a bit of the Centcom / Centcomm thing. **This PR includes a bunch of changes to player-facing stuff**. Names, descriptions, etc, wherever NanoTrasen was not spelled fully in lowercase (e.g. `nanotrasen flag`) have been cased as "NanoTrasen" instead of "Nanotrasen." **This PR does not include changes to internal code or prototype names.** That would be hell. This PR also includes exactly one fix for a Centcomm misspelling. ## Why we need to add this <!-- What is the reason for adding these changes? Please post links to Discussions as well as Bug Reports here. Please describe how this will change the game balance. --> Consistency. We had one role "NanoTrasen Representative" that would appear on the manifest right next to "Nanotrasen Career Trainer." That's silly. ## Media (Video/Screenshots) <!-- If your PR contains in-game changes you must provide screenshots/videos of the changes. --> <img width="425" height="180" alt="image" src="https://github.com/user-attachments/assets/36e08488-9b4e-44eb-a5e8-d2c590ca21aa" /> fig. 1 - NCT is now spelled "NanoTrasen Career Trainer" instead of "Nanotrasen Career Trainer." <img width="570" height="95" alt="image" src="https://github.com/user-attachments/assets/e76fee4b-1d2f-464e-af21-51e1f322ee6f" /> fig. 2 - Stuff like Syndicate briefings now spell it as NanoTrasen. <img width="408" height="289" alt="image" src="https://github.com/user-attachments/assets/244ddd30-4519-4f9f-9fc1-042de711d6e5" /> fig. 3 - Even the spam mail now spells it as NanoTrasen. ## Checks <!-- check boxes for faster reviewing of your PR --> - [x] I do not require assistance to complete the PR. - [x] Before posting/requesting review of a PR, I have verified that the changes work. - [x] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [x] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions. **Changelog** <!-- If you want the players to know about changes made in this PR, specify them using the template outside the comment. Short and informative. :cl: STARLIGHT TEAM - add: Added Starlight. - remove: Removed SS13. - tweak: Changed SS14. - fix: Fixed Rinary. --> :cl: Caws - fix: The Central Administrative Division has rolled out a new program to ensure all stations are spelling "NanoTrasen" correctly. Please report any further misspelling (e.g. "Nanotrasen") to your local CAD officer at your earliest convenience.
## Short description <!-- What do you propose to change with your PR? --> ## Why we need to add this Adds the Octavous axe for NTSF request of teapotterror for NTSF detachments in lore. ## Media (Video/Screenshots) <img width="405" height="355" alt="image" src="https://github.com/user-attachments/assets/5d803ef4-550b-4ce0-ae1e-b0ccceb92341" /> ## Checks <!-- check boxes for faster reviewing of your PR --> - [x] I do not require assistance to complete the PR. - [x] Before posting/requesting review of a PR, I have verified that the changes work. - [x] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [x] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions. **Changelog** :cl: Scarlet Lightweaver, Teapotterror, Conflee. - add: Added the NTSF headsman axe, revs wheep. --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
## Short description <!-- What do you propose to change with your PR? --> Fixes escape pods not landing on planets. ## Why we need to add this <!-- What is the reason for adding these changes? Please post links to Discussions as well as Bug Reports here. Please describe how this will change the game balance. --> Bugfix ## Media (Video/Screenshots) <!-- If your PR contains in-game changes you must provide screenshots/videos of the changes. --> Before <img width="1307" height="823" alt="image" src="https://github.com/user-attachments/assets/4496a9dc-d224-41e6-ab67-f025f93e6fd2" /> After <img width="1168" height="771" alt="image" src="https://github.com/user-attachments/assets/6df60eed-df9b-48f3-a4a8-b9a42f026a2b" /> ## Checks <!-- check boxes for faster reviewing of your PR --> - [X] I do not require assistance to complete the PR. - [X] Before posting/requesting review of a PR, I have verified that the changes work. - [X] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [X] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions. **Changelog** <!-- If you want the players to know about changes made in this PR, specify them using the template outside the comment. Short and informative. :cl: STARLIGHT TEAM - add: Added Starlight. - remove: Removed SS13. - tweak: Changed SS14. - fix: Fixed Rinary. --> :cl: CrazyPhantom - fix: Escape pods will no longer be stranded in space. Co-authored-by: Your Name <you@example.com>
…es (#4419) ## Short description <!-- What do you propose to change with your PR? --> Changes various antag-related gamerules to allow for non-humanoids. This will be largely invisible to most players; the purpose of the change is to allow non-humanoids to enter more antag roles. ## Why we need to add this <!-- What is the reason for adding these changes? Please post links to Discussions as well as Bug Reports here. Please describe how this will change the game balance. --> Discussion at certain points in time from folks like Walksanator indicate a potential desire to have non-humanoid roundstart playable characters. Many players like playing antagonist roles, and prior to this change, the only gamerules that non-humanoids could enter were vampire and thief. This allows most antags to be rolled for non-humanoids. Notably, the changeling gamerule specifically does not allow non-humanoids due to potential complications from the changeling's mechanics relying on HumanoidAppearance. <img width="1008" height="327" alt="image" src="https://github.com/user-attachments/assets/aa459822-5270-4fbb-8a3e-4ee6063fff9c" /> <img width="1227" height="536" alt="image" src="https://github.com/user-attachments/assets/3b9a54ee-d837-4726-ba8f-08c55b2f2c2a" /> ## Media (Video/Screenshots) <!-- If your PR contains in-game changes you must provide screenshots/videos of the changes. --> <img width="296" height="191" alt="image" src="https://github.com/user-attachments/assets/d37df54d-659b-455e-a454-c512a3864a83" /> ## Checks <!-- check boxes for faster reviewing of your PR --> - [X] I do not require assistance to complete the PR. - [X] Before posting/requesting review of a PR, I have verified that the changes work. - [X] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [X] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions. **Changelog** :cl: Sparlight - tweak: Most antagonist gamerules now allow non-humanoids to be selected. <!-- If you want the players to know about changes made in this PR, specify them using the template outside the comment. Short and informative. :cl: STARLIGHT TEAM - add: Added Starlight. - remove: Removed SS13. - tweak: Changed SS14. - fix: Fixed Rinary. --> --------- Co-authored-by: Rinary <rinary.super@gmail.com>
Changes borgi to have a unique sprite from other corgi's ## Short description Differentiates borgi's from corgi's by giving them a dedicated sprite ## Why we need to add this Visual differentiation between different entities, gives borgi's slightly more identity as cyborg hounds ## Media (Video/Screenshots) <img width="461" height="454" alt="image" src="https://github.com/user-attachments/assets/75eef33a-36e3-4f99-9917-1eaafb6ddc12" /> https://github.com/user-attachments/assets/8c1c2162-d023-485b-bd10-edfbc1a00c79 ## Checks <!-- check boxes for faster reviewing of your PR --> - [x] I do not require assistance to complete the PR. - [x] Before posting/requesting review of a PR, I have verified that the changes work. - [x] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [x] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions. **Changelog** :cl: Swonki - add: Borgi Sprite. --------- Co-authored-by: Rinary <rinary.super@gmail.com>
## Short description <!-- What do you propose to change with your PR? --> Cleans up the Shuttles -> X (And unfoldered) server files in _Starlight. No more warnings besides obsoletes. ## Why we need to add this <!-- What is the reason for adding these changes? Please post links to Discussions as well as Bug Reports here. Please describe how this will change the game balance. --> A clean Repo is a nice repo! ## Media (Video/Screenshots) <!-- If your PR contains in-game changes you must provide screenshots/videos of the changes. --> N/A ## Checks <!-- check boxes for faster reviewing of your PR --> - [X] I do not require assistance to complete the PR. - [X] Before posting/requesting review of a PR, I have verified that the changes work. - [X] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [X] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions. Not player facing Co-authored-by: Your Name <you@example.com> Co-authored-by: Rinary <rinary.super@gmail.com>
## Short description restores content which was deemed not to violate rule 10 ## Why we need to add this related conversation in staff chat https://discord.com/channels/1272545509562777621/1356838103670849710/1503055932261797981 ## Media (Video/Screenshots) N/A, only restores loadouts ## Checks <!-- check boxes for faster reviewing of your PR --> - [X] I do not require assistance to complete the PR. - [X] Before posting/requesting review of a PR, I have verified that the changes work. - [X] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [X] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions. **Changelog** :cl: kirb - add: restores some previously removed animal themed trinkets. --------- Co-authored-by: Rinary <rinary.super@gmail.com>
## Short description TL;DR is we have some Far Horizons code that wasn't updated. I just updated it. Port of Far-Horizons-SS14/Far-Horizons-SS14#645 FH Commits 63f9d4e and 1353331 ## Why we need to add this <!-- What is the reason for adding these changes? Please post links to Discussions as well as Bug Reports here. Please describe how this will change the game balance. --> Exceptions are being thrown when removing infection anomalies: ``` Caught exception in entsys System.InvalidOperationException: Removing a component, Robust.Server.GameObjects.PointLightComponent before it has been added is probably not what you wanted to do. Target entity was Artemy Stamatin (3998970/n3998970, MobHuman, IamDaniel). at Robust.Shared.GameObjects.EntityManager.ThrowPreAddRemovalException(EntityUid target, IComponent component) in /home/runner/work/space-station-14/space-station-14/RobustToolbox/Robust.Shared/GameObjects/EntityManager.Components.cs:line 626 at Robust.Shared.GameObjects.EntityManager.RemoveComponentImmediate(EntityUid uid, IComponent component, CompIdx idx, Boolean terminating, MetaDataComponent meta) in /home/runner/work/space-station-14/space-station-14/RobustToolbox/Robust.Shared/GameObjects/EntityManager.Components.cs:line 642 at Content.Server.Anomaly.Effects.InnerBodyAnomalySystem.RemoveComponents(EntityUid target, ComponentRegistry components) in /home/runner/work/space-station-14/space-station-14/Content.Server/Anomaly/Effects/InnerBodyAnomalySystem.cs:line 261 at Content.Server.Anomaly.Effects.InnerBodyAnomalySystem.RemoveAnomalyFromBody(Entity`1 ent) in /home/runner/work/space-station-14/space-station-14/Content.Server/Anomaly/Effects/InnerBodyAnomalySystem.cs:line 218 at Robust.Shared.GameObjects.EntityEventBus.<>c__DisplayClass57_0`2.<SubscribeLocalEvent>g__EventHandler|0(EntityUid uid, IComponent comp, Unit& ev) in /home/runner/work/space-station-14/space-station-14/RobustToolbox/Robust.Shared/GameObjects/EntityEventBus.Directed.cs:line 305 at Robust.Shared.GameObjects.EntityEventBus.EntDispatch(EntityUid euid, Type eventType, Unit& args) in /home/runner/work/space-station-14/space-station-14/RobustToolbox/Robust.Shared/GameObjects/EntityEventBus.Directed.cs:line 572 at Content.Shared.Anomaly.SharedAnomalySystem.EndAnomaly(EntityUid uid, AnomalyComponent component, Boolean supercritical, Boolean spawnCore, Boolean logged) in /home/runner/work/space-station-14/space-station-14/Content.Shared/Anomaly/SharedAnomalySystem.cs:line 206 ``` Occurences of "Ending anomaly" last 24h: <img width="1837" height="244" alt="image" src="https://github.com/user-attachments/assets/4d6abef5-92b4-4565-a822-2ce71a42e54c" /> Bug reports: - https://discord.com/channels/1272545509562777621/1504756751243677717 - https://discord.com/channels/1272545509562777621/1504601563531055214 - https://discord.com/channels/1272545509562777621/1504577097476083853 - https://discord.com/channels/1272545509562777621/1504565755847508129 If an infection anomaly crits, it doesn't remove, it instead just crits infinitely. ## Media (Video/Screenshots) <!-- If your PR contains in-game changes you must provide screenshots/videos of the changes. --> N/a Exceptions were thrown before, none are thrown after. ## Checks <!-- check boxes for faster reviewing of your PR --> - [x] I do not require assistance to complete the PR. - [x] Before posting/requesting review of a PR, I have verified that the changes work. - [x] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [x] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions. **Changelog** <!-- If you want the players to know about changes made in this PR, specify them using the template outside the comment. Short and informative. --> :cl: Rinary - fix: Infection anomalies can actually be removed. --------- Co-authored-by: Rinary <rinary.super@gmail.com>
Fire Suit, HoS and Warden Hardsuits ## Short description Adds more missing corgi clothing options ## Why we need to add this Fills missing corgi security hardsuits and fire suit ## Media (Video/Screenshots) <img width="357" height="446" alt="image" src="https://github.com/user-attachments/assets/c67be01c-a5a1-48cd-8cee-4a5c2331fa20" /> ## Checks <!-- check boxes for faster reviewing of your PR --> - [x] I do not require assistance to complete the PR. - [x] Before posting/requesting review of a PR, I have verified that the changes work. - [x] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [x] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions. **Changelog** :cl: Swonki - add: Corgi Firesuit+Helmet. - add: Corgi Head of Security Hardsuit. - add: Corgi Warden Hardsuit. --------- Co-authored-by: Rinary <rinary.super@gmail.com>
## Short description
This quick PR adds 2 new organ sprites and 15 new graffiti images.
## Why we need to add this
Laspi currently have human tongues and eyeballs, as there are no
species-specific mechanics tied to these organs. This adds new organs
with suitably goofy names ("slurpoid" and "peepoids") that have unique
sprites.
It also includes a number of graffiti for various purposes: Slime Crime,
Slime Time, #RobotGang (for honkbot-IPC solidarity), a @neomoth
callback, and 11 aielith-specific runes of dark magic for decorating
shrines.
## Media (Video/Screenshots)
<img width="421" height="193" alt="image"
src="https://github.com/user-attachments/assets/4b16c1c7-5526-4ff3-a4b2-61d083b62339"
/>
Top and bottom: graffiti
Middle: peepoids and slurpoid
(Note: the "merge my fucking PR" graffiti is monochromatic, it is shown
here overlaid 4 times in different hues for maximum authenticity.)
## Checks
- [ ] I do not require assistance to complete the PR.
- [x] Before posting/requesting review of a PR, I have verified that the
changes work.
- [x] I have added screenshots/videos of the changes, or this PR does
not change in-game mechanics.
- [x] I affirm that my changes are licensed under the [MIT
License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT)
and grant permission for use in this repository under its conditions.
**Changelog**
:cl: Rhetorica
- add: Peepoids.
- add: Slurpoids.
- add: SLIME TIME and SLIME CRIME graffiti.
- add: #RobotGang graffito, for those special times when borgs and IPCs
adopt bots as friends.
- add: MERGE NEOMOTH'S PR graffito.
- add: 11 aielith dark magic runes as graffiti.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
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.
Short description
LICENSE: BSD-2-Clause
Why we need to add this
Media (Video/Screenshots)
Checks
Changelog
🆑