another draft pr for plasmaman #2
Open
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
github-actions
bot
added
Changes: C#
Changes: Localization
Changes: YML
Changes: Sprite
labels
|
RSI Diff Bot; head commit 67cf147 merging into 613eb05 Resources/Textures/Clothing/Hands/Gloves/Envirogloves/plasma.rsi
Resources/Textures/Clothing/Head/Envirohelms/atmos.rsi
Resources/Textures/Clothing/Head/Envirohelms/captain.rsi
Resources/Textures/Clothing/Head/Envirohelms/cargo.rsi
Resources/Textures/Clothing/Head/Envirohelms/ce.rsi
Resources/Textures/Clothing/Head/Envirohelms/chaplain.rsi
Resources/Textures/Clothing/Head/Envirohelms/chemist.rsi
Resources/Textures/Clothing/Head/Envirohelms/clown.rsi
Resources/Textures/Clothing/Head/Envirohelms/cmo.rsi
Resources/Textures/Clothing/Head/Envirohelms/commander.rsi
Resources/Textures/Clothing/Head/Envirohelms/coroner.rsi
Resources/Textures/Clothing/Head/Envirohelms/engineering.rsi
Resources/Textures/Clothing/Head/Envirohelms/geneticist.rsi
Resources/Textures/Clothing/Head/Envirohelms/hop.rsi
Resources/Textures/Clothing/Head/Envirohelms/hos.rsi
Resources/Textures/Clothing/Head/Envirohelms/hydroponics.rsi
Resources/Textures/Clothing/Head/Envirohelms/intern.rsi
Resources/Textures/Clothing/Head/Envirohelms/janitor.rsi
Resources/Textures/Clothing/Head/Envirohelms/librarian.rsi
Resources/Textures/Clothing/Head/Envirohelms/medical.rsi
|
github-actions
bot
added
Changes: Audio
Changes: Documentation
Changes: UI
Changes: Map
labels
* Add mapping editor (Simple-Station#757) * Remove mapping actions, never again * Cleanup actions system * Jarvis, remove all references to CM14 * Fix InventoryUIController crashing when an InventoryGui is not found * Rename mapping1 to mapping * Clean up context calls * Add doc comments * Add delegate for hiding decals in the mapping screen * Jarvis mission failed * a * Add test * Fix not flushing save stream in mapping manager * change * Fix verbs * fixes * localise --------- Co-authored-by: DrSmugleaf <[email protected]> Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: Pieter-Jan Briers <[email protected]>
The F3 coords manager is blocked if you're not an admin. This check happened even when playing a replay, where you actually aren't. There's now a check to make sure you are actually server-connected-to-game before running the logic. Also moved it to a manager because this *shouldn't be a bloody entity system in the first place*.
fixes the "missing layer" error Co-authored-by: slarticodefast <[email protected]>
Signed-off-by: Skubman <[email protected]>
…us/Einstein-Engines into Ignore-Warnings-In-Tests
ashing too op
I'm trying something out.
<!-- 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 Adds Cohiba Robusto cigars from SS13 for our heavy smoker HoS. --- # TODO <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> I'll think something up one day --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: Added Cohiba Robusto cigars - tweak: Tweaked nicotine amounts in cigars, smoke longer
Plasmamen gone WOKE?? Plasmamen more like PlasmaTHEY
Taken from: Fansana/floofstation1#501 <!-- 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 the Batonbot and the Disablerbot. Both of these will idle around until they encounter hostile wildlife, such as angry slimes, and will then liberally apply their respective weapon until the threat is no more. The Batonbot has a weakened version of the Baton, applying 15 less Stamins damage and only 4 burn damage The Disablerbot uses the SMG Disabler bullet with a significant spread at a fire rate of 1 This means that both of them are less powerful than a normal baton or disabler. They are built with: - Proximity Sensor - Security Helmet - Stunbaton/Disabler As such requiring co-operation from Security to construct. Also included are Spawners, for if we want them on stations on round-start. The recipes necessitated a few new tags, which have been marked with # Floofstation, along with the reason they were added to the entities. --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p> https://github.com/user-attachments/assets/8e6c9861-004c-4138-abcc-f0fe203ed9d0 https://github.com/user-attachments/assets/7c7cd08d-3c8e-4896-8f25-ce8cd5a4fb0e </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: Timfa - add: Add Batonbot - add: Add Disablerbot --------- Co-authored-by: stellar-novas <[email protected]>
# Description Ports MODsuits from Goobstation PR Goob-Station/Goob-Station#1242. The PR author has confirmed that he is okay with me doing this. --- # TODO - [X] Port in sprites - [x] Port in YMLs - [X] Port code - [x] Port code PATCHES - [x] Update EE with required fixes --- <details><summary><h1>Media</h1></summary> <p> ## Modsuit crafting https://github.com/user-attachments/assets/8ff03d3a-0fc1-4818-b710-bfc43f0e2a68 ## Modsuit sealing https://github.com/user-attachments/assets/6671459a-7767-499b-8678-062fc1db7134 </p> </details> --- # Changelog :cl: - add: Modsuits have been ported from Goobstation! --------- Signed-off-by: Eris <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]> Co-authored-by: VMSolidus <[email protected]>
Signed-off-by: Skubman <[email protected]>
Hate having to use the same buffer for pills? Want sorting and container solutions for output? No need to wait _any_ longer! A brand new pill buffer, a sort feature _for_ the new pill buffer **and** you have your amount buttons back! Showcase: https://ptb.discord.com/channels/1218698320155906090/1218698321053356060/1332224976803074123 🆑 - add: A new ChemMaster experience has been granted to the people of Einstein Engines. Includes a pill buffer!
# Description I have incredibly vivid memories from SS13 over a decade ago. In particular, every time the Supermatter delaminated, one of the Engineers would inevitably end up heroically sacrificing themself by walking directly into the supermatter core in order to drag the crystal to space. This was made only possible because the engineering suits made you immune to fire damage. It's currently not possible for engineers to do this, since fire damage is ABSURD, and having an 80% reduction to 400 damage per second is still death in less than 3 seconds. So this PR corrects the injustice. Now the chief engineer gets to heroically sacrifice himself by dragging the supermatter crystal out to space. # Changelog :cl: - add: Engineering Hardsuits, Maxim Hardsuit, and Cybersun's Elite Tacsuit now all make the wearer immune to atmos fires. Have fun walking directly into the supermatter engine. Play out your heroic engineer fantasy by dragging the supermatter crystal to space in order to save the station. --------- Co-authored-by: sleepyyapril <[email protected]>
# Description This ports Playing Cards from: Estacao Pirata... Frontier... and GoobStation... More specifically, ports Goob-Station/Goob-Station#1215 and Goob-Station/Goob-Station#1311 sequentially. In short... - Adds 3 skins of the playing cards: Nanotrasen, Syndicate, and Black. - NT can be obtained as an item in your loadout but is locked behind a command job. - Syndicate can be obtained as a pointless item in the uplink for 1 TC. - Black can be obtained both as an item in your loadout and from the Games Vendor. --- # TODO before review <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [X] De-namespace all of (_)EstacaoPirata? (not required, it is an EE fork) - [X] **_TO MAINTAINERS/CONTRIBS, NEED YOUR INPUT!!!_**: See `Content.Client/Inventory/StrippableBoundUserInterface.cs:220`'s "DRAFT TODO". Basically its me asking how to involve the thieving trait in the omission of the playing cards in the strip menu. Currently, it does not take into account the trait and simply obscures. (prolly dont take the trait into account, obscure regardless) - [X] Figure out what to do with the Nanotrasen deck variant: should it remain free like the black deck or restricted like the syndicate? Locked behind any command job? (prolly this) - [X] Get media actually filled in --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: Playing Cards. You may get one in the Games Vendor or as an item in your loadout. --------- Co-authored-by: VMSolidus <[email protected]>
more than likely this is just because of invalid loadouts
port DeltaV-Station/Delta-v#2707 (with permission) :cl: ElusiveCoin - add: Added a new species, the Chitinid. --------- Signed-off-by: sleepyyapril <[email protected]> Co-authored-by: ElusiveCoin <[email protected]> Co-authored-by: rosieposie <[email protected]> Co-authored-by: Delta-V bot <[email protected]> Co-authored-by: Nemanja <[email protected]> Co-authored-by: VMSolidus <[email protected]>
better for MRP this code is originally by me anyway, they just made it better :cl: - tweak: Kill random person objective has been replaced by teaching them a lesson, removing the need to RR a random person. --------- Signed-off-by: sleepyyapril <[email protected]> Co-authored-by: Lyndomen <[email protected]> Co-authored-by: Milon <[email protected]> Co-authored-by: deltanedas <[email protected]> Co-authored-by: VMSolidus <[email protected]>
# Description Melee Weapons were accidentally given the wrong attack speed formula again. It took me awhile of reviewing the entire history, but eventually I found the line where the wizmerge introduced a new check that used the old formula. Also to help prevent this from happening again, I've put in a request to be set as codeowner for the relevant systems I have significantly modified. # Changelog :cl: - fix: Fixed melee weapons having the wrong attack speed calculations(again)
Signed-off-by: VMSolidus <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Description.
TODO
Media
Changelog
🆑