EE Merge #189
Merged
EE Merge #189
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Description This adds the wonderful `Psionics Registry Computer` which allows you to, just like Criminal Records, mark people that will show their icons to other individuals wearing the appropriate gear, and will allow you to keep track of such individuals in a similar way by making a `PsiWatch` app that will show the reasons. For the purposes of easement, I've left the fingerprints and DNA in there, but individuals will not show up with it in the actual file. The game would just crash when I removed the filters, so I left them in. The dropdown also just looked cleaner when it was there instead of removing it and replacing it with a label. I've recolored the sprites for the sec-glasses and sec-HUD to make the epi-glasses and epi-HUD using Epistemics colors. I've recolored the sprite for the CriminalRecords computer to look different and be cool. --- # TODO A list of things I've done split into categories. ### Spriting - [x] (Recolor) Sprite the epi-glasses and epi-HUD. - [x] Sprite the PsionicsRecords computer screen. - [x] Sprite the Psionics Status icons. - [x] Change the sprite for the Psionics Abusing (it is hard to tell any difference from suspected right now). ### Records - [x] Set up records XAML that basically duplicates the Criminal Records. - [x] Remove History (not necessary). - [x] Change all the naming schema to match. - [x] Change the categories and setup reason-requirement for each submission type. - [x] Change the "reason" to "psionics" so it is more intuitive. ### Computer Setup - [x] Setup computer to show UI. - [x] Setup system to report to report to Epistemics (Science) radio when anything is changed. - [x] Setup the system to only accept Epistemics (Research) access. - [x] Setup the computer board. - [x] Setup the sprites for the computers. ### Equipment and Icons - [x] Create the icons and ensure the ShowPsionicsRecordIcons prototype works. - [x] Create the entity prototypes for the glasses and HUD in the game to show textures. - [x] Set it up so the glasses and HUD show the user the icons when they're wearing them (having hard time fixing this at 06:00 in the morning). ### PDA App - [x] Setup the PDA app to mimic the SecWatch app as its own (PsiWatch). - [x] Add the PDA app cartridge to Chaplain, Mantis, Cataloguer, and Mystagogue. - [x] Add cartridge to the Mystagogue locker (so they can give others it). ### Loadouts - [x] Add the epi-HUD to the Chaplain, Mantis, Cataloguer and Mystagogue. - [x] Add the epi-glasses to the Mystagogue. - [x] Add the epi-glasses to Chaplain, Mantis, and Cataloguer (for 3 points). ### Mapping - [x] Add the Psionics Registry Computer to every map. ### Miscellaneous Fixes/Changes - [x] Make the computer only work for Chaplain (Chapel), Cataloguer (Library), Mantis (Mantis), and Mystagogue (ResearchDirector). - [x] Fix Chaplain PDA (did not have any programs installed automatically, now it does). --- # Media I will add more media when I finish the rest. For now, it's just us. <details><summary><h3>Registry Working</h3></summary> <p> https://github.com/user-attachments/assets/f534a1b6-6873-4bcd-9fe5-c7138069ecc0 </p> </details> <details><summary><h3>Loadouts and PsiWatch</h3></summary> <p> Cataloguer  Chaplain  Mantis  Mystagogue  --- No Users in PsiWatch  Suspected in PsiWatch  Registered in PsiWatch  Abusing in PsiWatch  PsiWatch in PDA  Picture of the PDAs and PsiWatch Cartridge  --- Mystagogue Lockers with PsiWatch Cartridge  </p> </details> <details><summary><h3>Mapping Locations</h3></summary> <p> Arena  Asterisk  Core  Edge  Europa  Gaxstation  Glacier  Hive  Lighthouse  Meta  Pebble  Radstation  Saltern  Shoukou  Submarine  Tortuga  </p> </details> --- # Changelog :cl: - add: Added Psionics Registry Computer. Now you can record Psionics users in Epistemics. - add: Added epi-glasses and epi-HUD to see Psionics Users icons. (Chaplain, Cataloguer, Mantis, and Mystagogue have access in loadout). - add: Added PsiWatch. Now you can see the Psionics Records data on your PDA! - fix: Fixed Chaplain not having any programs in their PDA on spawn. --------- Signed-off-by: sleepyyapril <[email protected]> Co-authored-by: sleepyyapril <[email protected]>
# Changelog :cl: - tweak: Made the Redshirt trait's description say what it does Signed-off-by: DEATHB4DEFEAT <[email protected]>
# Description This gives the Blueshield Officer a Central Command Headset and gives them MedTek as well (by giving ERT Leader MedTek). The Blueshield Officer should have access to a Central Command Headset to communicate with the other Dignitaries (NTR and MAG) and to communicate with Central Command if they are the only acting Dignitary as well. The Blueshield Officer should have access to MedTek since they already have access to their sunglasses so that they can check the injuries of an injured command without needing a health analyzer. --- # Changelog :cl: - add: Added MedTek to Blushield Officer PDA. - tweak: Blueshield Officer now has a Central Command Headset instead of an All-Access Command Headset.
# Description Supermatter was essentially interacting with atmos about 20 to 60 times faster than the atmos system was doing its own calculations, since *at least some of atmos* is differentiated with respect to time, whereas Supermatter was not. Thus supermatter was updating atmos fully every single tick, whereas elsewhere these variables were being divided by the delta time(multiply by Update(frameTime)). You can think of these equations as, "How much it is modified per unit of time", and multiplying by frameTime is the same as making it, "Per second". This should rather dramatically cut down on the problem Supermatter has where its seemingly going to explode every single round if even the tiniest thing goes wrong, and that nothing you could do could save it if it catches fire. # Changelog :cl: - fix: Fixed the Supermatter engine math so that it actually respects the server's tickrate. It should now be SIGNIFICANTLY less likely to enter a plasma fire death spiral. If it does catch fire, just make sure coolant is being pumped into the engine, and start blasting it with a fire extinguisher.
for our janitors :cl: - tweak: Tweaked puddles and footsteps to be able to see them in context menu. --------- Co-authored-by: deltanedas <[email protected]> Co-authored-by: metalgearsloth <[email protected]>
# Description By request from the very same person who assisted with Simple-Station/Einstein-Engines#1618 This PR ports(and fixes) space-wizards/space-station-14#23372 such that it works on modern Robust Toolbox. This PR essentially makes it so that the Singularity (And Tesla by extension) inherit some of the momentum of objects thrown into them. Im practice it means that they now work more like they do in SS13, whereby if a traitor does not actively intervene in a Singuloose(such as by using a Singularity Beacon), the singularity will usually be "Blown back into space" by space wind throwing objects at it in retaliation to it eating engineering. <details><summary><h1>Media</h1></summary> <p> https://github.com/user-attachments/assets/04e9e5b9-d873-4425-b19a-b854b57db486 </p> </details> # Changelog :cl: - add: Singularity and Tesla are now affected by objects thrown into them, causing them to change directions. Unless a traitor intervenes (with a Singularity Beacon), a "Singuloose" is extremely likely to be blown out to space. --------- Signed-off-by: VMSolidus <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]>
There absolutely should not be something deleting the player characters when starting a round. --------- Co-authored-by: Leon Friedrich <[email protected]>
yes this is a system i dont know why it's not better named
it is genuinely so bad :cl: - remove: Remove mana.
it will no longer choose vox or lamia.
# Description Updated the MacOS logo to the EE one. Also, the base logo was 256x258, which caused me physical distress, so I fixed that too. # Changelog None
This reverts commit 881ae3b. not a valid png
Co-authored-by: stellar-novas <[email protected]> Co-authored-by: RedFoxIV <[email protected]>
This is the same as #1625, but it doesn't use symlinks, which are broken on Windows. # Changelog None
# Description Adds a displacement map for Harpies so that they can now wear pants. <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- # Changelog :cl: - add: Harpies can now wear pants, and have a displacement map to make them look less terrible when doing so.
accidentally used sourcegen
ports #31556 Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: Pieter-Jan Briers <[email protected]>
# Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> We like mechs here, yeah? --- # 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: Mocho, John Space - tweak: The H.O.N.K. has received an airtight cabin for honk operations in outer space. - add: Added the Ripley MK-II, a heavy, slow all-purpose mech, featuring a pressurized cabin for space operations. - add: Added the Clarke, A fast moving mech for space travel, with built in thrusters (not certain if they work properly though :trollface:) - add: Added the Gygax, a lightly armored and highly mobile mech with enough force to rip walls, or someone's head off. - add: Added the Durand, a slow but beefy combat suit that you dont want to fight in close quarters. - add: Added the Marauder, a specialized mech issued to ERT operatives. - add: Added the Seraph, a specialized combat suit issued to ??? operatives. - add: The syndicate has started issuing units under the codenames "Dark Gygax" and "Mauler" to syndicate agents at an introductory price. - add: The exosuit fabricator can now be emagged to reveal new recipes. - add: There are 4 new bounties cargo can fulfill for mechs. Feedback on the cost/reward is welcome! --------- Signed-off-by: sleepyyapril <[email protected]> Co-authored-by: John Space <[email protected]> Co-authored-by: gluesniffler <[email protected]> Co-authored-by: ScyronX <[email protected]>
Co-authored-by: VMSolidus <[email protected]>
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Adds cosmetic pronouns, visible through examining people (if they have any) as a PushMarkup. Adds Station AI/borg name customization. CCVars: customize.allow_cosmetic_pronouns (default false) customize.allow_custom_station_ai_name (default false) customize.allow_custom_cyborg_name (default false, for borgs, mediborgs, etc) --- # 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 cosmetic pronouns. (disabled by default) - add: Added Station AI name customization through character customization. (disabled by default) - add: Added Cyborg name customization through character customization. (disabled by default)
…… (#1599) # Description Adds some more expensive weapons to security which eat up more value. idea from [goob MRP](https://discord.com/channels/1323488536501944350/1330495398137298975) --- # 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 2 new security loadout items - tweak: Tweaked BSO's ammo - fix: Fixed energy cutlass sprite - remove: Removed broken Ion component --------- Co-authored-by: sleepyyapril <[email protected]>
…ngines into ee-merge-several-times-yes
# Description Howdy, y'all, I apologize for the delay, but I've finally completed the Box Station for EE. I've added a few things, including the supermatter crystal (SM) with the thermal-electric generator (TEG) near the Atmos Department TEG-KIT. I've also added all the job spawn points that were available for now: NanotrasenRepresentative, BlueshieldOfficer, Magistrate, AdministrativeAssistant, SeniorEngineer, SeniorPhysician, SeniorResearcher, SeniorOfficer, MailCarrier, ForensicMantis, Roboticist, MailCarrier, Reporter, StationAI, and MedicalBorg. Finally, I added holopads in all departments with AI upload (all law circuit boards). <details><summary><h1>Media</h1></summary> <p>                        </p> </details> --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: Mike32oz - add: Box Station, supermatter crystal, holopads, and Thermal-electric generator. - tweak: Box Station, Engineer, Medical, Epistemics, Cargo, Security, and Service Departments. - remove: Box Station, Particle Accelerator Room in Engineer Departments. --------- Signed-off-by: sleepyyapril <[email protected]> Co-authored-by: stellar-novas <[email protected]> Co-authored-by: VMSolidus <[email protected]> Co-authored-by: sleepyyapril <[email protected]>
…ngines into ee-merge-several-times-yes
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.
No description provided.