[MDB IGNORE] [IDB IGNORE] Upstream mirror #424
Merged
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
![psychonaut-ci[bot]](https://avatars.githubusercontent.com/u/121906662?s=60&v=4){kind=small}
…(#88542) ## About The Pull Request The amount of synthflesh required to unhusk now changes based on the purity of synthflesh 60u for 100% purity, 80u for 75% purity, 100u for 60% purity and below. ## Why It's Good For The Game Encourages people to interact with the purity system a bit more. Most of the time, players only use synthflesh for unhusking with no regard for the purity of the chem. ## Changelog :cl: balance: Synthflesh required for unhusking now between 60u and 100u depending on purity. /:cl: --------- Co-authored-by: SyncIt21 <[email protected]>
## About The Pull Request Add `UNIQUE_RENAME` flag to binary devices (pumps, valves, etc.) so you can rename them with a pen. Add a check to `/obj/machinery/atmospherics/update_name` to accommodate this. ## Why It's Good For The Game On a lot of maps the roundstart atmos pumps are labelled and if you end up swapping them you lose that. Also sometimes you just want to label your inscrutable atmos setup and while you can use a hand labeller it's kind of ugly. ## Changelog :cl: qol: Atmos devices like valves and pumps can now be renamed with a pen. /:cl:
Stops sass from screaming about deprecated apis.
## About The Pull Request - Fixes #87235 Nested access levels after you unlock the crate for the 2nd time was too much even for the captain to deal with ## Changelog :cl: fix: personal ordered crates can be unlocked & relocked as many times again after the 1st attempt /:cl:
## About The Pull Request Closes #88592  ## Why It's Good For The Game Map consistency, bartenders need it to do their job ## Changelog :cl: map: Added a Condi-Master to Birdshot's bar /:cl:
## About The Pull Request - Fixes #87829 Ensures we can't enter invalid values that actually run timed in this specific case ## Changelog :cl: fix: greyscale modify menu has better validation for player entered colours /:cl:
…s (#88600) ## About The Pull Request You can now wear shoes with digitigrade legs thanks to #88096, but UI slots weren't informed of this change. ## Changelog :cl: fix: Fixed shoes slot being semi-transparent when you have digitigrade legs /:cl:
## About The Pull Request Nitroglycerin heals heart damage when metabolized ## Why It's Good For The Game - I thought it'd be a fun nod to one of the actual uses of Nitroglycerin. - "Plausible Deniability" to chemists making Nitroglycerin. - Adds more niche chem effects to the ecosystem chemists may experiment with. ## Changelog :cl: Melbert add: Nitroglycerin now heals heart damage. /:cl:
## About The Pull Request Teleporter code is at least +15 years old. This no longer applies. ## Why It's Good For The Game Accuracy. ## Changelog :cl: spellcheck: Update teleporter machine desc to be accurate /:cl:
## About The Pull Request - Fixes #88103 ## Changelog :cl: fix: fixed runtime when sealing mecha cabin with air tank installed /:cl:
## About The Pull Request There were two variables mixed up. It was `SEND_SOUND(holder, radio_noise)`, though it should be `SEND_SOUND(holder, radio_receive)`. Now everything is in place And also added `COOLDOWN_START(src, audio_cooldown, 0.5 SECONDS)` so that you don't hear two sounds at the same time when you talk into the radio <details> <summary>Screenshots/Videos</summary> https://github.com/user-attachments/assets/1afc1b36-4b6e-41d0-825d-aab6d9bdf694 </details> ## Why It's Good For The Game it's just a code issue ## Changelog :cl: fix: fix radio sound output when receiving a message sound: the sound of receiving your own messages over the radio is no longer played /:cl:
…88608) ## About The Pull Request - if an explosion epicenter is not on a station area, then it will not screen shake all mobs on the z level if it was really far ## Why It's Good For The Game - why should a bomb from 100 tiles away screenshake the entire z level? - players have brought up their annoyance with icebox gitbtonite shaking the entire z level every time one explodes. ## Changelog :cl: grungussuss del: screenshake from explosions will no longer happen when it's really far and not on a station area (turf) /:cl:
## About The Pull Request `5 SECONDS` instead of `50` ## Why It's Good For The Game Better code. ## Changelog :cl: code: Improved teleporter SECONDS defines /:cl:
## About The Pull Request
Apparently adding a tiny coffee machine worth of power to make this
accurate:
`to_chat(user, span_warning("You vastly increase projector power and
override the safety and security protocols."))`
was too much. So let's just do a grammar tweak to fix it.
Is
## Why It's Good For The Game
Accurate descriptions.
## Changelog
:cl:
spellcheck: Fix holodeck emag message claiming to increase power
/:cl:
## About The Pull Request This makes it so leeching walk and ascended rust heretic healing effects (the healing that occurs during life ticks) have the healing amount multiplied by `DELTA_WORLD_TIME(SSmobs)`, to compensate for skipped/delayed fires. ## Why It's Good For The Game Delays in SSmobs firing (i.e explosions pausing all non-ticker subsystems) can very easily get you killed if you're relying on the rust heretic healing mid-combat. ## Changelog :cl: qol: Rust heretic healing (leeching walk, rust ascension) now, so server lag shouldn't fuck you over nearly as much if you're relying on the healing. /:cl:
…ow!" (#88610) ## About The Pull Request Made bioscrabmle() proc's armor check silent and moved text from a successful block into its early return. ## Why It's Good For The Game Less than 100 protection from bioscramblers doesn't do anything, so text about "armor softening the blow" is nonsensical, both as there is no blow to soften, and as armor below 100 doesn't actually do anything. A bit of a nitpick, but its been annoying me to all hell every time I encounter one (as RD's coat provides some protection). Only other source of BIO armor checks is Phazon, but the text makes sense there and nothing runs armor checks against FIRE and ACID, so there's nothing else to fix. ## Changelog :cl: spellcheck: Bioscrambler no longer informs you about "your armor softening the blow!" /:cl:
## About The Pull Request Partially a port of DaedalusDock/daedalusdock#1163 which is a port of my own code from bitbus Closes #88579 Instead of manually setting hud images and positioning we now can use set_hud_image_state which also updates their position to ensure that they scale with the owner atom. HUDs had RESET_COLOR and RESET_TRANSFORM but no KEEP_APART, so they were stuck with mobs all this time. I replaced RESET_TRANSFORM with PIXEL_SCALE (shouldn't be reserved to mob huds only to be honest) and added KEEP_APART, so that HUDs still scale/rotate with their owner but don't inherit their color. Also fixed the dragon issue, that's where this PR actually started. Closes tgstation/tgstation#45411 ## Why It's Good For The Game I don't want my HUDs to be pretty pink when I make a barbie Clarke. ## Changelog :cl: refactor: Rewrote some of HUD code so they're no longer colored in their owner's color fix: Space dragons no longer turn invisible when toggling seethrough mode /:cl:
…s stun when smashed over someones head. (#88480) Co-authored-by: SmArtKar <[email protected]>
## About The Pull Request Allow filtering for entertainment radio and newscaster in the text log ## Why It's Good For The Game Sometimes you want a tab that lets you focus without the TV on in the background ## Changelog :cl: LT3 qol: Entertainment and newscaster broadcasts can be toggled in chat tabs /:cl:
## About The Pull Request I noticed rped was hitting tables instead of being placed on them so this fixes that, I tested it ## Changelog :cl: grungussuss fix: fixed being unable to place rpeds on tables /:cl: --------- Co-authored-by: SyncIt21 <[email protected]>
Renames all uses of caller, as they (currently) shadow the new byond var and will in future error Ups our "wan if compiled after" experiement compile version to 516 Adds an alternate 516 unit test
## About The Pull Request - Fixes subtype flatpacks missing a name when in vending machines - Adds default price for vending flatpacks - Moves flatpacks into their own .dm file - Groups the mail related items together in the CargoDrobe ## Why It's Good For The Game All vending machine flatpacks having identical names despite the contents of the flatpack is less than ideal ## Changelog :cl: LT3 fix: Premade/vending machine flatpacks now display what board is inside /:cl:
## About The Pull Request Adds rift fishing to the game.  Drained and undrained influences can be fished in, the latter only by heretics. Fishing in an undrained influence shows a bobber floating over nothing to other people, so don't be stupid! The loot pool includes the following: - Knowledge. Great for heretics, bad for crew. Only actually gives knowledge if fished up in an unopened rift, opening it. One of each heretic potion type. - A wild Fire Shark, hostile to all. - One of each heretic potion, and two flasks of eldritch essence. - Several new fish:  In order: 1. Chrystarfish Cosmostarfishe that snuck into the bluespace compartment of a shuttle engine. Teleports around when eaten. Can be cut into bluespace crystals. Very pointy. 2. Flumpulus Probably not an actual fish. Contains flumpuline, which is in many ways an upgrade to oculine. Except for it occasionally popping your eyes out and replacing them with fungus. It also gets flattened if you land on it, cushioning your fall.  3. Gullion This fish can be cut into two diamonds, and needs no mate to reproduce, making it an excellent way to replenish the station's diamond supply! However, it needs silicon in the fish tank to survive. 4. Walro-Dolphish Weird, amphibious creature. Amazing weapon - high damage, strong piercing wounds, decent block chances. However, it will bite you if you hold it for too long, so be careful! More fish are planned to be added. The PR was split in two to reduce review complexity as the latter half of the fish were increasingly convoluted. Any fishing rod will do for fishing, but heretics are now able to infuse their fishing rod with a grasp:  Infusing the rod will temporarily improve its fishing modifier and give it a unique trait that lets heretics gather 2 influence, rather than 1, from a fished-up rift. If crew fish up a glimpse of the Mansus, they will recieve the same effects as if they examined the rift, and a curse hand will shoot out at them. influences cannot be bombed for fish. ## Why It's Good For The Game Rifts are _extremely_ close to basically just being eldritch pools of liquid that some heretic spilled over the station. It's always stuck out like a sore thumb that we can't fish in them, but now we _can_. (Also, someone needs to PR fishing in a bucket for clowns and mimes.) Fishing in a rift is just one of those things you see some random, innocent assistant do while doing an errand, passively enhancing the round with the sheer ridiculousness of it. Coming back, it's likely you'll see them running from a wild Fire Shark they unwisely dug up from messing with eldritch influences. For Heretics, this is for the most part actively a worse alternative than just doing things normally. But sometimes you don't want to be optimal. Infusing their fishing rod is almost entirely an amusing twist on the blade infusion that blade path has, and they can even infuse other people's rods - make fish not war. Ghommie gave me the fish sprites, and I interpreted them the silliest and most interesting ways I could think of. > Chrystarfish Bluespace's technobabble has finally reached fish. Much like the Gullion, the intention here was primarily some additional, risky way to procure some amount of bluespace crystals and dust that doesn't depend on Mining to do their job, either for the station or for your own stupid plans. (Obviously mining is still the best way to get it, but it's not healthy for the game for them to be the ONLY way to do so!) >Flumpulus  Imagine taking a pill of 'Super oculine!' and suddenly your eyes pop out and are replaced with fungeyes. 10/10 >Gullion Diamonds are extremely scarce on the station and the only way to get more is by mining. I thought adding some rare, restricted way of getting more would be fun for the game, and encourage fish breeding. Parthenogenesis may be a bit much admittedly, but let's just see what happens > Walro-Dolphish The name for this thing kinda sucks. I like the idea of an amphibious fish-weapon like the pikes that actually kinda just hates being wielded around like a stick. It's also piercing to differentiate.  ## Changelog :cl: Carlarc, Ghommie add: Adds rift fishing to the game. Includes new wacky fish! add: Drained and undrained influences can be fished in, the latter only by heretics. Fishing in an undrained influence shows a bobber floating over nothing to other people, so don't be stupid! add: influences cannot be bombed for fish. add: Heretics can now infuse their fishing rod, and fish for knowledge. /:cl: --------- Co-authored-by: Ghom <[email protected]>
…obby songs (#88642) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request - added title0.ogg to default lobby songs (it was completely unused) partially handles tgstation/tgstation#86856 these files are removed, transfers the files to the asset repo: tgstation/SS13-assets#41 - compressed_air1.ogg - compressed_air2.ogg - door_lock.ogg <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game file organization by moving unused stuff to the unused asset repo and unused lobby song <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and its effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> nothing player facing <!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
# Conflicts: # code/datums/components/pet_commands/fetch.dm # code/game/machinery/computer/_computer.dm # code/modules/admin/verbs/admingame.dm # code/modules/admin/verbs/adminhelp.dm # code/modules/admin/verbs/adminpm.dm # code/modules/admin/verbs/secrets.dm # html/changelogs/archive/2024-12.yml
Seefaaa
force-pushed
the
mirror-2847c01563c
branch
from
ce4db44 to
b471284
Compare
Seefaaa
force-pushed
the
mirror-2847c01563c
branch
from
b471284 to
01eebca
Compare
Seefaaa
approved these changes
Dec 29, 2024
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.
This is an automated pull request to merge the latest changes from the upstream repository.
The following files have conflicts: