upstream pull#4
Draft
ivomink wants to merge 4369 commits into
Draft
Conversation
## Short description <!-- What do you propose to change with your PR? --> Changes the NTSF PDAs from being CentComm PDAs to their own unique designs. ## 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 reason for this change is that lore-wise, NTSF are not members of CentComm, but use CC PDAs at the moment. This PR switches their PDAs to be unique. I've opted to keep them using CC pens however, but just using the pen is far more believable (also saves us from having to add a new cybersun pen variant if NT just uses the CC one). ## Media (Video/Screenshots) <!-- If your PR contains in-game changes you must provide screenshots/videos of the changes. --> <img width="644" height="450" alt="Screenshot 2026-06-17 133023" src="https://github.com/user-attachments/assets/dd37e0ed-4975-49c3-8d3d-747e56e311e8" /> ## Checks <!-- check boxes for faster reviewing of your PR --> - [ ] 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: StygianEagle - tweak: NTSF and Decimus figured out where they misplaced their real PDAs and as such CC has retaken possession of their spare PDAs.
…orced blind due to no eyes (#4838) ## Short description <!-- What do you propose to change with your PR? --> Two bug fixes, and my second attempt to fix this :) 1) This is a bug fix for #3952 Currently a player can get their eyes removed, get buckled or un buckled and then regain their sight! 2) This fixes non humanoids like a mouse or hamster from going blind from eating carrots because animal and mouse body's had no heads with eyes. So before when we checked for eyes it always forced them to be blind. ## 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. --> Fixes two bugs ## Media (Video/Screenshots) <!-- If your PR contains in-game changes you must provide screenshots/videos of the changes. --> same behavior as my failed PR: https://www.youtube.com/watch?v=CNUPx2skSBI And when you eat a carrot as a mouse you just don't get blinded :P ## 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: Toxyams - fix: Buckling( and un-buckling) no longer restores blindness. - fix: Animals such as mouse, hamsters can eat carrots without going blind.
## Short description <!-- What do you propose to change with your PR? --> This PR aims to make some minor improvements to NT Personnel. - Starting Flash - Flash contraband includes NT Personnel - NTCT added to Corporate Secrets in Metashield ## 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. --> **Starting Flashes** NT Personnel are allowed flashes per SOP but as it currently stands must go get them from security. This can lead to situations where you are left without a flash when you need one for defense. **Flash contraband includes NT Personnel** This one is pretty self explanatory, NT Personnel is allowed flashes per SOP it shouldn't be contraband. ## Media (Video/Screenshots) <!-- If your PR contains in-game changes you must provide screenshots/videos of the changes. --> <img width="256" height="128" alt="image" src="https://github.com/user-attachments/assets/23242b7e-ca5d-4c7c-8656-f99171bb6c4b" /> <img width="256" height="128" alt="image" src="https://github.com/user-attachments/assets/8cb361ea-1a8d-400d-b1c3-f2ec739bf6a7" /> <img width="224" height="128" alt="image" src="https://github.com/user-attachments/assets/809a2e5c-96dd-4b07-9921-4f276c93ded8" /> <img width="911" height="49" alt="image" src="https://github.com/user-attachments/assets/21231f5a-b8d3-4128-ab14-3c3498a1809c" /> <img width="851" height="107" alt="image" src="https://github.com/user-attachments/assets/f533f6b9-a290-471b-81c5-08d0708456d9" /> <img width="843" height="120" alt="image" src="https://github.com/user-attachments/assets/b34268f4-8f24-4a3b-91a0-0790188cc3bf" /> ## 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: Tjmaxmillion - add: The NTR, Magistrate, IAA and NTCT now start with a flash. - add: NTCT added to Corporate Secrets in Metashield. - tweak: Flashes are no longer contraband for NT Personnel. --------- Co-authored-by: Shin <99152399+wonderfulnewworld@users.noreply.github.com> Co-authored-by: Rinary <rinary.super@gmail.com>
## Short description Replaces a cyclorite and shadekin randomly generated name, since those players are staff members now. ## Why we need to add this So people don't accidentally break rule 14. ## 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. No changelog needed on this one, since it would just put targets on those staff members.
## Short description Follows up #3865 with 2 more sets of medical vendors, DeForest Medical and NanoMed GOLD. With them, also standardizes the equipment in all 4 of our medical vendor types, so we can more clearly specialize each type, which I have also done. The 4 types now each have their own niche: - NanoMed - Standard jack of all trades - Interdyne - Better topicals, worse supplementary pills and chemicals - DeForest - Better injectors, "worse" topicals (they heal less but you get 15 of them) and no automenders - NanoMed GOLD - WAY better topicals, but less of everything (but nothing gets reduced to 0) Likewise, I have added a deforest topical, a blue jet injector, and weird pills for the DeForest vendor, and gold topicals and gold pills for the NanoMed GOLD. Finally, I have added random Medical Vending Machine spawners (departmental, civilian, departmental wall, and civilian wall), so these 4 can be randomly spawned in during rounds. (~70% NanoMed, ~20% DeForest, ~10% Interdyne, and then a 1% rare spawn NanoMed GOLD. The NanoMed Gold uses the rare prototype part of the component, so it roll seperately than the others, so their rates don't actually add up to 100%, but rather, 99%.) ## Why we need to add this More variation for our setting, and more variation for our stations. ## Media (Video/Screenshots) <img width="730" height="823" alt="image" src="https://github.com/user-attachments/assets/929f0247-51a9-4b8a-b95e-6219164ba200" /> <img width="611" height="140" alt="image" src="https://github.com/user-attachments/assets/479a483f-b0e0-45b7-aac6-99ccaf52d096" /> The GOLD one is exceedingly rare, a 1% spawn. <img width="602" height="705" alt="image" src="https://github.com/user-attachments/assets/281f00fa-2f57-4d93-be20-112a68779498" /> DeForest jet injector <img width="362" height="115" alt="image" src="https://github.com/user-attachments/assets/225c0396-964b-4a31-86ba-64f02851f8f7" /> Jackpot! <img width="425" height="154" alt="image" src="https://github.com/user-attachments/assets/3eae0cf2-d9e2-48e1-839a-96179f1752e0" /> Better suffixes for mappers <img width="396" height="654" alt="image" src="https://github.com/user-attachments/assets/228e76d3-5f96-46ad-8361-241c4211f273" /> ## 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: wonderfulnewworld, Conflee - add: Added DeForest Interstellar/Planetary and NanoMed GOLD/Civilian medical vendors. - add: Added random medical vending machine spawners. - add: Added weird pills and golden (random) pills. - tweak: Standardizes items in medical vendors, then specializes them based on vendor type. - tweak: Medical vendors have clearer suffixes now.
## Short description Personal ghost theme for Head Spriter @Conflee (hey thats me!) ## Why we need to add this I want it, and am a Dept Head. ## Media (Video/Screenshots) <img width="667" height="673" alt="image" src="https://github.com/user-attachments/assets/03dead4b-5297-4f15-a764-0e9632b02ccc" /> ## Checks - [X] I do not require assistance to complete the PR. - [ ] 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 This PR adjusts the webs of terror spiders. This PR adjusts the colors of three webs in order to make them more visually distinct from other webs. The "Airtight" webs, the "Thick" webs that create occlusions, and the "Spiderling" webs that repel spiderlings were adjusted. This PR also removes silk drops from terror spider webs, as terror spiders have no use for silk, the crew has extremely limited use, and the silk dropped by webs was creating incredibly large messes when terror spider nests were cleared out. This PR also adjusts the Spiderling web to use the same parent the other spider webs use for consistency sake/so I don't have to redefine it to drop 0 silk when spider webs have their own drop rate it would inherit. ## Why we need to add this Visual clarity makes the mode more fun overall. Crew and Spiders should generally know what they're walking over in most cases. Airtight webs in particular were lacking needed visual clarity, which led to spiders often stand on top of them and choking, or other spiders placing over webs that were preventing spacings. Spiderling webs need to be able to be seen so someone can adjust them if spiderlings are behaving oddly. Thick spider webs looked a little funny being bright white in the middle of a shadow. The messes that were being left behind by raids on terror spider nests were becoming ridiculous. Examples below: <img width="1936" height="1336" alt="image" src="https://github.com/user-attachments/assets/381a587f-f4d7-4866-996e-37682e897593" /> <img width="1939" height="1297" alt="image" src="https://github.com/user-attachments/assets/c9da2754-e068-4766-8e7c-c5f62f508d2b" /> ## Media (Video/Screenshots) <img width="2435" height="1139" alt="image" src="https://github.com/user-attachments/assets/f20f1c61-cff1-4896-8487-8475acf0cc7a" /> https://github.com/user-attachments/assets/f0e7abdc-5399-4ad2-bac1-a3df06ab3c1c ## 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: AegisShield - remove: Removed silk drops from terror spider webs. - tweak: Tweaked Airtight, Spiderling, and Thick web colors to be more visually distinct.
## Short description <!-- What do you propose to change with your PR? --> Migrates all of our files from wizden ones. Ive manually confirmed all of these files through merging the entire of our repo into a latest wizden fork. Ive left out some key things like localization, Sprites, Maps and some entities related to NuBody changes. I will also be manually re-confirming all this at a later date when doing the rest ## 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. --> Completes 85% of migration chores ## 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. All this work and its not even player facing ;-; --------- Co-authored-by: Your Name <you@example.com>
## Short description Updates Box, Cog, Fland, Kiloton, and Space Mall to current mapping requirements. - Added Shipyard Console. - Added Kiki Spawn Marker and Reagent Grinder to Botany. - Updated all Fax Machines to use the new prototypes. - Additional decoration such as Wall Fans, Platforms, Junction Boxes, Hatch Decals, and Random Nest Spawners. - Turned Box's maints botany into a Lawyers Office and added a new maints botany slightly north of where the old one was, next to the maints bar. ## Why we need to add this Resolved #4760 , #4759 , and #4758 for these 5 maps. ## Media (Video/Screenshots) <img width="808" height="665" alt="image" src="https://github.com/user-attachments/assets/b9d56e49-c26b-4ce4-84b0-888634b5454e" /> Example of some decorating. I did a lot, not going to post everything. <img width="656" height="818" alt="image" src="https://github.com/user-attachments/assets/021f58b5-65a2-43af-a89b-701a596002d7" /> Box's new Lawyer Office <img width="790" height="704" alt="image" src="https://github.com/user-attachments/assets/9fca521f-b9fd-45c0-bab9-4db6e2d93c97" /> Box's new Maints Botany ## 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: Conflee - tweak: Map Upkeep for Box, Cog, Fland, Kiloton, and Space Mall. Added Kiki Spawner to Botany, Reagent Grinder to Botany, Shipyard Console to Bridge/Captain's Office, updated all Fax Machines to use the new prototypes, decorated with Hatches/Wall Fans/Junction Boxes/Platforms/etc, added Random Nest Spawners to maints, gave Box a proper Lawyer Officer where Maints Botany used to be, and added a new Maints Botany to Box next to Maints Bar.
## Short description Giving the chief engineer a custom RCD that recharges by itself. ## Why we need to add this Its a cool lil custom tool that the CE can use, especially now that borgs dont have recharging RCDs. Also, people want it: https://discord.com/channels/1272545509562777621/1514411303689785384 ## Media (Video/Screenshots) <img width="838" height="443" alt="image" src="https://github.com/user-attachments/assets/7cff91f4-8c83-4dd3-ae2e-6410733ccf5a" /> ## 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: Johnny - add: Added a custom RCD that is given to the chief engineer. --------- Co-authored-by: CawsForConcern <kopczynski.zesty@gmail.com> Co-authored-by: Red Mushie <82113471+redmushie@users.noreply.github.com>
## Short description Fixes naming schemes and time reqs from #4947 ## Why we need to add this Fixes naming schemes and time reqs from ## Media (Video/Screenshots) <!-- <img width="1212" height="804" alt="image" src="https://github.com/user-attachments/assets/080df736-2749-4db0-83a1-d095c1846387" /> <img width="1156" height="786" alt="image" src="https://github.com/user-attachments/assets/2ced18e8-a078-4380-abb1-2317826e2af5" /> --> ## 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: TeddiousbearPA - tweak: Added time requirements for senior formal uniforms and deputy for Sec/Dutyoff. - tweak: Renamed Deputy Formal to Deputy. - tweak: Updated Meta files to new Copyright standard. --------- Co-authored-by: Rinary <rinary.super@gmail.com> Co-authored-by: Red Mushie <82113471+redmushie@users.noreply.github.com>
## Short description Adds the Lone Colossus back to the event pool. Asked Crazy about it, they said they didn't know why it was removed, but weren't against it coming back in. Also cleans up part of the event scheduler, basically just porting some of the work I did on the Antag Selection rewrite, since maintaining two schedulers was getting annoying. ## Why we need to add this NoRoundEnders was added solely to remove zombies from the event scheduler pool in Survival, but then we removed zombies from the event scheduler pool in every other gamemode too, so this scheduler no longer has a reason to exist. As for the colossus, it's a fun midround antag to fight, and a blessing if it happens to roll in a cosmic cult round. I lowered it's weight a little, so it's about as rare as a lone op now. ## 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: wonderfulnewworld - tweak: The Lone Colossus will now spawn again occasionally.
## Short description Makes Cosmic Cult and Terror Spiders do an 8 minute Evac, like Nukies, so it's recallable. ## Why we need to add this 5 minutes for Cosmic Cult is un-recallable, and 10 minutes for Terror Spiders is too much. ## Media <img width="553" height="96" alt="image" src="https://github.com/user-attachments/assets/ac4df179-6cd4-422e-b9e6-727a33591f49" /> ## 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: wonderfulnewworld - tweak: The Cosmic Cult and Terror Spiders now call 8 minute evac shuttles instead of 5 and 10 minutes respectively.
## Short description
- MarkingPicker: drop the redundant Loc.GetString wrapper on
GetMarkingName, which already returns a localized string (spammed
marking display names).
- MaterialDisplay: don't localize the bare sheet-eject count
('1'/'5'/'10').
- RoleTimeRequirement: use the play-time tracker's LocalizedName instead
of localizing the raw tracker id, which warned for non-job trackers
(AntagTraitor/AntagNukeops/AntagThief).
- Add missing roles-antag-ssf-name / -objective loc strings.
## Why we need to add this
Closes #4807
Cleans up logged warnings
## 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.
**Changelog**
:cl: ku-mo
- fix: Marking names in the character editor no longer spam localization
warnings.
- fix: Material storage eject buttons no longer spam localization
warnings.
- fix: Antag playtime requirements no longer spam localization warnings.
## Short description First PR to Starlight and god I hope I did this right! I've taken over as the Maintainer of Saltern- this PR completes a few chores assigned by Caws: -Shipyard Console -Fax Machine Update -Kiki & Botany QoL As well as makes some additional changes to prepare for a broader reshuffle of Saltern: -Added a Theater! -Relocated the displaced NCT to Evac, Disposals to southwest maints -Moved the IAA to a temporary office to prepare for the coming Law department! (Also tweaks some old plushies to fix their TTS components since they were mapped.) ## Why we need to add this The map is in need of a refresh and I'm just getting started. I have extensively discussed (read: pestered) Caws with all my current and future plans. ## Media (Video/Screenshots) <img width="1165" height="976" alt="Theater" src="https://github.com/user-attachments/assets/c1ba1818-caec-48c7-82f4-e1f284f056dc" /> <img width="946" height="961" alt="NCT" src="https://github.com/user-attachments/assets/4e8739c2-3d1d-4dd8-8b2c-54d9faef79a7" /> <img width="1220" height="1109" alt="IAA" src="https://github.com/user-attachments/assets/a869728e-10fb-4595-823e-88531bcaa883" /> <img width="1173" height="967" alt="Dispo" src="https://github.com/user-attachments/assets/cc740f9a-bb79-40f2-8a5a-19bbf415ffbf" /> ## 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: Rtasva - add: Saltern: Added Theater. - tweak: Saltern: Relocated NCT, IAA, and Disposals. - fix: Saltern: General mapping updates.
Technically was supposed to do this like 2 months ago with the mat bags but idk ## Short description Makes the Engineering Hardsuits faster and not completely horrific to navigate with Also made the RCD fit in pocket Made Fire suit faster so it also stays a sidegrade for Atmos players Added missing shock and caustic to Atmos hardsuit, as well as higher heat resist because, i mean, why not, that thing is THE heat resistant suit. ## Why we need to add this Engineering Hardsuits were the slowest in the game for no justifiable reason, 30% slowdown for 10% resist and decent rad resist was not it. ## Media (Video/Screenshots) <img width="455" height="473" alt="Screenshot 2026-07-07 204337" src="https://github.com/user-attachments/assets/3f86370c-fbed-4015-b9e1-920374d00ce8" /> <img width="470" height="438" alt="Screenshot 2026-07-07 204343" src="https://github.com/user-attachments/assets/f54179a8-d525-4990-9e2c-2af6116deec8" /> <img width="416" height="370" alt="Screenshot 2026-07-07 204348" src="https://github.com/user-attachments/assets/e27bf593-255c-4a10-8ef9-aa7b57bbd5bd" /> <img width="443" height="306" alt="Screenshot 2026-07-07 204411" src="https://github.com/user-attachments/assets/c58ac17d-c6b3-48e5-bff8-aa738053d6d4" /> <img width="1010" height="122" alt="Screenshot 2026-07-07 203405" src="https://github.com/user-attachments/assets/26053b7e-6af6-432a-ad9f-35fdce9cdb99" /> ## 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. :cl: Roro - tweak: Engineering Hardsuit slowdown 30% -> 15%. - tweak: Atmos Hardsuit slowdown 30% -> 15%. - tweak: Chief Engineer Hardsuit slowdown 20% -> 10%. - tweak: Atmos Fire suit slowdown 20% -> 10%. - tweak: RCD now fits in pocket. - tweak: Atmos Hardsuit now has shock and caustic resists, as well as higher heat resist 20% -> 35%.
## Short description <!-- What do you propose to change with your PR? --> Allow air alarms to be labeled. ## 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. --> To permit players the ability to label Air Alarms, to bring it into line with other atmospheric and power devices. A useful feature when doing large projects involving air alarms. ## Media (Video/Screenshots) <!-- If your PR contains in-game changes you must provide screenshots/videos of the changes. --> <img width="788" height="403" alt="image" src="https://github.com/user-attachments/assets/0f4162a2-d152-456b-9b66-ac71e55306cd" /> <img width="1679" height="1091" alt="image" src="https://github.com/user-attachments/assets/0c373e49-021a-44f1-9f3f-01babc99d0ed" /> ## 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: OMEGA - tweak: Air alarms can now be labeled.
## Short description <!-- What do you propose to change with your PR? --> Quality of Life fixes for Elkridge, primarily in engineering. ## 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. --> Quality of Life changes only, for bugs and inconsistencies reported. ## Media (Video/Screenshots) <!-- If your PR contains in-game changes you must provide screenshots/videos of the changes. --> <img width="4448" height="4224" alt="Elkridge-0" src="https://github.com/user-attachments/assets/806d817d-f9df-4f1d-885a-ba59505e508f" /> ## 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: OMEGA - add: (Elkridge) Atmos locker and spawn point to match the available job slots. - tweak: (Elkridge) Blast doors linked to their respective buttons in TEG and Atmos. - tweak: (Elkridge) Atmos airlock expanded, doors now linked. - tweak: (Elkridge) Access to TEG changed to Atmospherics. - tweak: (Elkridge) Firelocks by vault entrance linked to relevant fire alarm console.
…4878) ## Short description Nerf the reporter vest, its intended of being enough to survive on WATCHING the combats, so this pr is made to address that. ## Why we need to add this Reporter Armor Currently used and matched on the wrong context, its supposed to not be a armor, but a tool to be used to report live combats so they can be reported to crew, the use is not intended to combat, as SS14 is a RP game and reporter has no need of combat nor starting defense. A lot of handheld cameras can get station sub-network messy, so i limited to reporters. Armor was slightly nerfed to be less used on wrong context, if it keeps being used frequently like that ill tweak more. ## Media (Video/Screenshots) <img width="899" height="429" alt="image" src="https://github.com/user-attachments/assets/82779b1a-d6d8-410d-b61f-5f6dd16f2a7c" /> ## 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: Vincolan - add: Reporter simple SOP! Don't abuse press equipment >:( . - tweak: Nerfed Press Armor. - tweak: Handheld Cameras are limited to Reporters. --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: Red Mushie <82113471+redmushie@users.noreply.github.com>
…e up from sleep (#5043) ## Short description <!-- What do you propose to change with your PR? --> I hate this bug and no one's fixed it so I'm fixing it. Whenever you woke up from sleeping (whether it was sleeping on a bed or due to chems like nocturine / breathing nitrious oxide), you would get the "seeing stars" effect above your head **forever**. I ported a one line fix from space-wizards/space-station-14#39409 This: ```csharp // Here so server can tell the client to do things // Don't dirty the component if we don't need to if (!Appearance.TryGetData<bool>(entity, StunVisuals.SeeingStars, out var stars, entity.Comp) && stars) return; ``` Was fixed to this: ```csharp // Here so server can tell the client to do things // Don't dirty the component if we don't need to if (Appearance.TryGetData<bool>(entity, StunVisuals.SeeingStars, out var stars, entity.Comp) && stars) return; ``` So I didn't put a SL comment on it. The other line is mine. Every time you woke up from sleep, it would apply the seeing stars to you because you woke up from being asleep. Honestly this code is somewhat bewildering to me because the stunned visuals aren't applied when you go to sleep in the first place? I kept the fix minimally invasive - just one line of code that avoids applying the 'seeing stars' effect if you are waking up. ## 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. People don't do a ton of sleeping on beds (unless they're purposely getting the effect), but this is a massive meta fix for vampires in particular because you would have a shitload of people with seeing stars if a vampire was sleeping a lot of people. ## Media (Video/Screenshots) <!-- If your PR contains in-game changes you must provide screenshots/videos of the changes. --> https://github.com/user-attachments/assets/6da1675c-a07e-48af-8365-93cbda34c629 fig. 1 - Demo of 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. **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: You will no longer permanently have the 'seeing stars' effect stuck on your character after waking up from being asleep.
…5029) ## Short description Ports the XenoArtifactTest update from [GameTest Part 2](space-wizards/space-station-14#43207), and a recent update to the test from Wizden [#43930](space-wizards/space-station-14#43930). ## Why we need to add this I'm tired of this test flaking. ## 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. No changelog, nothing player facing. --------- Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
## Short description Move Execute and PDA medtek Analyse patient verbs to shared so we can add client-side prediction. ## Why we need to add this Brings this up to date with ss14 best practises s. ## 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: Mack - fix: Fixed the MedTak Analyse Patient verb popping in by adding client-side verb prediction. - fix: Fixed the Execute verb popping in by adding client-side verb prediction. --------- Co-authored-by: Red Mushie <82113471+redmushie@users.noreply.github.com>
…Store (#5041) ## Short description <!-- What do you propose to change with your PR? --> Starboard has a lot of problems and is not well maintained. This PR helps fix a lot of those problems. See Media & Changelog. ## 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. --> - People hate that the floor of Botany and Kitchen _always_ starts covered in tomato juice. - People hate that the floor of Medical _always_ starts covered in vomit. - Starboard has 3 Chemistry work stations and only 2 Chemists. Maybe the idea was that the CMO would man the 3rd one, but in reality the CMO is busy with other stuff most of the time. - People love the Drug Stores that Lex has added maps like Oasis and Space Mall. ## Media (Video/Screenshots) <!-- If your PR contains in-game changes you must provide screenshots/videos of the changes. --> <img width="1291" height="999" alt="image" src="https://github.com/user-attachments/assets/3de99755-bef2-4b23-b942-1ada6c8b861f" /> fig. 1 - New Drug Store. This replaces a section of Maints that connected to nothing and didn't matter. <img width="1290" height="993" alt="image" src="https://github.com/user-attachments/assets/fd2ca674-6aa6-4009-a0af-153b90e6ef82" /> <img width="1301" height="996" alt="image" src="https://github.com/user-attachments/assets/6b939a83-dc1e-4293-a6a7-791c51eb2909" /> fig. 2 - Chemistry has a public facing desk now and the entrance to Medical sucks way less. You're no longer behind multiple airlocks that doctors cannot see you from. <img width="1283" height="989" alt="image" src="https://github.com/user-attachments/assets/c06d60f0-c15d-4bf4-8242-f267d89ebb3e" /> fig. 3 - Botany isn't covered in roundstart tomato juice every round now. <img width="1289" height="989" alt="image" src="https://github.com/user-attachments/assets/0494bd83-9f9e-4bfd-b368-1e2b542330b6" /> fig. 4 - Same with the kitchen. It also now has deli stands that chefs can put stuff into. <img width="1286" height="969" alt="image" src="https://github.com/user-attachments/assets/fd5ff6ef-dae5-4c0d-a8d4-ad8d6458b0ef" /> fig. 5 - Theatre's stage looks nicer now with the platforms added a while back. <img width="1089" height="868" alt="image" src="https://github.com/user-attachments/assets/34c005ce-2325-4991-99e8-7134aa3fc2c1" /> fig. 6 - I fixed a lot of ugly decals that didn't match the floor tiles in Morgue and halved the amount of lights. These areas were _extremely_ bright before this and used counter-intuitive lighting (warm orange lights in a place that should feel cold). ## 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: (Starboard) Space heaters added to Atmos. - add: (Starboard) Coffee dispenser added to Coffee Shop. - add: (Starboard) New Drugstore by Evac! Replaces a tiny part of Maints that didn't go anywhere. - tweak: (Starboard) Botany's floor no longer starts covered in tomato juice. - tweak: (Starboard) Kitchen's floor no longer starts covered in tomato juice. - tweak: (Starboard) Medbays's floor no longer starts covered in vomit. - tweak: (Starboard) Kitchen now has new deli stands at its front. - tweak: (Starboard) Updated the railings outside of Kitchen. - tweak: (Starboard) Updated the Theatre Stage to look a little nicer. - tweak: (Starboard) Chemistry now has a public-facing front desk. - tweak: (Starboard) Raised Chemistry jobslots from 2 to 4. - tweak: (Starboard) Medbay's entrance is far easier to access now. - fix: (Starboard) Fixed the entire mail network. - fix: (Starboard) Fixed a bunch of issues in North Maints where if you sneezed on it it'll space itself.
## Short description <!-- What do you propose to change with your PR? --> Ports new camera sprites from upstream space-wizards/space-station-14#44132 ## 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. --> These camera sprites look nice and make it a little easier to notice the camera's red "you're being watched" LED is on by virtue of having twice as many LEDs. ## Media (Video/Screenshots) <!-- If your PR contains in-game changes you must provide screenshots/videos of the changes. --> This media section is copied from space-wizards/space-station-14#44132 > Before and after: > <img width="256" height="256" alt="camera" src="https://github.com/user-attachments/assets/16a0db29-5068-4021-93bf-b4751ca9fc3c" /> > > Off: > <img width="310" height="299" alt="image" src="https://github.com/user-attachments/assets/ac9c8f5b-5091-4d40-8814-bc505a12a061" /> > On: > <img width="312" height="296" alt="20260527-1924-57 9206373" src="https://github.com/user-attachments/assets/2e44f041-2071-4dc1-8afc-7f641f75a345" /> > In use: > <img width="110" height="100" alt="20260527-1928-01 5780211" src="https://github.com/user-attachments/assets/959bebc2-d68a-47e7-b329-405b865620a2" /> > <img width="84" height="104" alt="20260527-1929-10 0575007" src="https://github.com/user-attachments/assets/35a2f7f8-4a33-4f22-ac9b-51de890b2ce9" /> > <img width="100" height="96" alt="20260527-1929-40 1879073" src="https://github.com/user-attachments/assets/cb539f65-0654-4b88-a5d6-3fd508f38061" /> > <img width="88" height="100" alt="20260527-1930-22 7201239" src="https://github.com/user-attachments/assets/5bb5cac0-6376-4a87-9165-8f7852b32234" /> > > There were also some unused sprites that got redrawn. These were in the same folder and I wasn't sure if they were used anywhere ingame, so I remade them, only to later realize they are unused. Anyway, they are now here in case anyone wants to use them in the future. > Emp: > <img width="128" height="128" alt="emp" src="https://github.com/user-attachments/assets/a657100f-c25d-4b7b-88b7-751e8710d6bd" /> > XRay camera: > <img width="128" height="128" alt="xray" src="https://github.com/user-attachments/assets/d923d6bc-a534-43df-83eb-0409cb48404e" /> I did verify they work properly after porting them though. <img width="552" height="480" alt="waow" src="https://github.com/user-attachments/assets/9e26576a-4fc0-4935-8371-8563cd302ab8" /> ## 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 - tweak: Ported updated security camera sprites / animations from Upstream.
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
🆑