Mergup #32
Merged
Mergup #32
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
Sometimes CreateEffect is called on a Invalid Entity. This now causes that to check, thus returning out and printing some hopefully helpful logs to try to track down the real source of this issue.
… on fire-mode + re-adds a toned down self recharge.) (#32104) * Rebalance HoS's Energy Shotgun * SLIGHTLY Up the max charge so the gun properly recharges all of its charges, which matters a lot more with the self charge cooldown system. * Prevent recharge cooldown if 0 power is used. * Makes the clientside HUD actually update to reflect the changes in firecost and thus max/current charges. * Properly fix that recharging to just under full issue instead of applying a budget fix to only the eshotgun. * Clean up the client ammo UI fix. * Update the self recharger component to comply with maintainer request. Co-authored-by: slarticodefast <[email protected]> * Remove code that was made redundant by a hotfix from another PR. * Make the recharge pause on EMP, document things where needed, clean up code as per maintainer request, add a note to make the code better when power is moved to shared. * Fix another internal issue * Code cleanup + fix the rapid recharge verb to remove pause. * cleanup --------- Co-authored-by: slarticodefast <[email protected]> Co-authored-by: metalgearsloth <[email protected]>
* Reset hopefully? * removes the emergency security orders * Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml Rewrites the description based on review Co-authored-by: NakataRin <[email protected]> * 7 shots, recharge taking 42 seconds * minor renaming :godo: * please work * Revert "please work" This reverts commit e84a2618d95ec17f5fd608331176df2ab8b0966c. * please fix --------- Co-authored-by: NakataRin <[email protected]>
…7939) * Resolve `'TransformComponent.MapPosition' is obsolete: 'Use TransformSystem.GetMapCoordinates'` in content * build?
This reverts commit b7d3d71.
…e this? do you need help?
Co-authored-by: KyuPolaris <[email protected]> Co-authored-by: sleepyyapril <[email protected]> # Description This is a port of TheDenSS14/TheDen#42 TheDenSS14/TheDen#109 Thanks a bunch April! This is mainly adding a ton of clothing items from Frontier. <details><summary><h1>Media</h1></summary> <p>   </p> </details> # Changelog :cl: - add: Ported a ton of new clothing items from Frontier --------- Co-authored-by: sleepyyapril <[email protected]> Co-authored-by: Tabitha <[email protected]> Co-authored-by: KyuPolaris <[email protected]>
# Description My last change to Pirate Radio made it so that it doesn't spawn at all. So this PR updates it to instead use a more accurate "Use the spawnable station" check. By picking a random valid spawnable station(in case there's more than one). # Changelog :cl: - fix: Fixed the Syndicate Listening Post not correctly spawning. Co-authored-by: sleepyyapril <[email protected]>
Prescription Medhud/Sechud Fix
<!-- 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 --> <!-- 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]? --> Added a fashionable Captain's Armored Trenchcoat. --- <!-- 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: Rosycup - add: Added an armored trenchcoat for the Captain. Enjoy your swag!
<!-- 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]? --> Fixed sec's summer uniform sprite having uneven pants. --- # 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: - fix: Fixed uneven pants leg on summer security uniforms.
Fixes the pronouns in the character preview to not show they/them pronouns for characters that use it/its <!-- 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]? --> This just adds another condition in the fluent file that controls the character preview text. Essentially, characters that use it/its pronouns will go from: "This is [character]. They are X years old." to "This is [character]. It is X years old." --- # 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 --> - [x] Probably test it, maybe. --- <!-- 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 --> # 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: Azzy - fix: Fixed they/them pronouns being displayed for it/its characters in the character preview.
# Description Re-adds CMO Turtleneck to the loadout (I swear to fucking god if I have to re-add it again I am going to commit many war crimes) --- # TODO - [x] turtle neck 👍 # 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: CMO Turtleneck back to loadout
<!-- 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 --> <!-- 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 a gas mask variant for the captain intended for combat encounters. --- <!-- 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 the Captain's Combat Gas Mask, for those more fond of close encounters. - tweak: Added the Captain's Trenchcoat to the other captain locker variants.
# Description merge asap to fix powergaming reel --- # TODO - [x] Contemplate abusing this as long as I can until this gets merged. --- # Changelog :cl: - fix: Fixed Syndicate Elite hardsuit being one singular Telecrystal. Cybersun will never recover from this financial blunder. Signed-off-by: Ducks <[email protected]>
# Description When Simple-Station/Einstein-Engines#720 (PR to raise trait limit from 5 to 10) was merged, we only had **53** traits. Now, we have a total of **109** traits. I was conservative with the trait limit back then because we didn't have as much traits, but now that we have so many we should raise the default trait limit from **10** to **14**. I believe 14 should be as high as it gets from now on. For reference, the quirk limit in /tg/ station is just a maximum of 6 positive quirks. So a typical build that reaches the 14 trait limit would be something like 6 positive traits, 6 negative traits to afford all of those positive traits, 1 language trait and 1 accent trait. # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: Skubman - tweak: The maximum trait limit has increased from 10 traits to 14 traits.
This reverts commit 1d068e3.
github-actions
bot
added
Changes: YML
Changes: C#
Changes: Localization
Changes: Sprite
labels
|
RSI Diff Bot; head commit 969f27a merging into 49c4674 Resources/Textures/Nyanotrasen/Clothing/Uniforms/Jumpsuit/summer_security.rsi
Resources/Textures/Clothing/Head/Misc/head_mirror.rsi
Resources/Textures/Clothing/Mask/gascaptaincombat.rsi
Resources/Textures/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi
Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi
Resources/Textures/_NF/Clothing/Belt/chaplain_sash.rsi
Resources/Textures/_NF/Clothing/Belt/chaplain_sash_overlay.rsi
Resources/Textures/_NF/Clothing/Belt/punk.rsi
Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi
Resources/Textures/_NF/Clothing/Head/Hats/bishop_mitre.rsi
Resources/Textures/_NF/Clothing/Head/Hats/cardinal_hat.rsi
Resources/Textures/_NF/Clothing/Head/Hats/kippah.rsi
Resources/Textures/_NF/Clothing/Head/Hats/pilgrim_hat.rsi
Resources/Textures/_NF/Clothing/Head/Hats/widebrim_hat.rsi
Resources/Textures/_NF/Clothing/Head/Hats/witch_hunter_hat.rsi
Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat.rsi
Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_blue.rsi
Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_green.rsi
Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_magenta.rsi
Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_yellow.rsi
Resources/Textures/_NF/Clothing/Head/Hoods/cardinal_hood.rsi
Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi
Resources/Textures/_NF/Clothing/Neck/Misc/crucifix.rsi
Resources/Textures/_NF/Clothing/Neck/Scarfs/chaplain_stole.rsi
Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_green.rsi
Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_orange.rsi
Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi
|
|
dont work |
Merged
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.