Merge Upstream 10.01.2025 #963
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
## About The Pull Request when you summon a virtual pet's hologram, itll automatically follow you on release rather than u having to give it the command ## Why It's Good For The Game adds some minor convenience to the minigame. ## Changelog :cl: qol: virtual pet holograms now automatically follow you when released rather than having to give it the command post summon /:cl:
…a fishing rod and a few bucks. (tgstation#88290) ## About The Pull Request You can now use a fishing rod to fish random vending products from vending machines, using holochips, coins and spacecash as bait. The value of the money used as bait will positively influence the chance of getting the pricier vending items, while using less than the minimum paycheck (25 credits) will increase the minigame difficulty and carries an additional, small risk of getting a dud or even hurling the vending machine in your direction. This also warranted a slight refactor of how vending product prices are set. ## Why It's Good For The Game Expands the list of things you can do with a fishing rod. Like for the organ manipulation fishing PR. This is not about getting fish, but the unconventional things we can do along the way. Now tested, it works. ## Changelog :cl: add: You can now try to fish random products out of vending machines with a fishing rod and a few bucks. fix: Fixing the 1000 cr holochip loot from exploration drones. /:cl:
## About The Pull Request yeah yeah, RESET_COLOR no KEEP_APART. Only remaining ones are lighting, and I'm waiting Potato's word on it. ## Changelog :cl: fix: Brought back ethereal heart's shine overlay /:cl:
## About The Pull Request Honestly thought that was already a thing but apparently even the older maps had issues with it. I originally opened sdmm1 to check why nebula's EVA/Gateway disposals weren't actually connected to anything when I randomly found two identical pipes stacked on top of each others further down the line, so I ended up fixing that instead at like 3 am using a text editor would probably have been much faster but again it was 3 am ive been suffering from a cold for the past like four days so i wasnt in my right head space probably  ## Why It's Good For The Game Two identical disposal pipe on the same tile serves no mechanical advantage ## Changelog :cl: fix: accidentally duplicated disposal pipes on all main maps have been rooted out /:cl:
## About The Pull Request ports DaedalusDock/daedalusdock#1123 credit to kapu for the code, I just adapted some of it for us While testing this I noticed that some ambience sounds have no fades, so I added them, you can see comparisons here: <details> <summary> Click me for comparisons! </summary> https://github.com/user-attachments/assets/0a93ec2f-7600-4510-9773-e2c721f06613 https://github.com/user-attachments/assets/3328a097-5dbc-402f-9dee-ece5aa7f9479 https://github.com/user-attachments/assets/b94157d4-a8a6-4877-94f6-1f07dc6ba860 https://github.com/user-attachments/assets/dc326c0c-7c8c-46ab-8149-97fd02dcc7f7 https://github.com/user-attachments/assets/e3309d6f-6d8d-4595-8c88-172c406f577d https://github.com/user-attachments/assets/64109759-cbf6-446f-baf9-5705e1c81662 https://github.com/user-attachments/assets/28c0a112-a758-49d6-9f44-8e451a895d7a https://github.com/user-attachments/assets/fec33b2e-6704-4d97-9c73-d0e58fef52ef https://github.com/user-attachments/assets/4dc780bf-3fb4-402a-8803-7aef2968e012 https://github.com/user-attachments/assets/93d63a31-36aa-437f-95bc-840427155701 https://github.com/user-attachments/assets/59fd09d4-207d-4f7c-8355-34fb37981df4 https://github.com/user-attachments/assets/8c14e1e8-75be-4081-acac-d2cea05f8638 https://github.com/user-attachments/assets/3dac481c-62ea-4fd9-93c5-36f8cbbfab9b https://github.com/user-attachments/assets/c92dd2aa-93f8-4c2e-9e00-7dbef3146280 https://github.com/user-attachments/assets/02baae83-2e51-4d83-8d97-be15bc58c6c9 https://github.com/user-attachments/assets/fcd969ac-7f29-4bb4-873c-30874e13516e https://github.com/user-attachments/assets/24a053a3-1a71-4758-bb90-149ebc6b50b6 https://github.com/user-attachments/assets/40e7adee-d0bf-4636-b4d0-bc1c5c17688f </details> ## Why It's Good For The Game - sound caching will open possibilities for seamless sound loops and overall knowing the length of a sound file is very useful - closes tgstation#87054 - fade ins and fade outs prevent audio glitches on abrupt audio ends and are nicer for the ears ## Changelog :cl: kapu and grungussuss fix: fixed ambience sounds getting cut off mid play sound: addes fades for maintenance ambiences refactor: changed the way maintenance sounds are /:cl: --------- Co-authored-by: Kapu1178 <[email protected]>
…idens battle rifle bands (tgstation#88741) ## About The Pull Request Title  ## Why It's Good For The Game It's hard to notice the super tiny one-pixel-tall ammo band of the rifle magazine, especially with the muted patterns I mistakenly added in my og PR. Pr is @necromanceranne approved! ## Changelog :cl: image: Standarizes ammo band colors into defines, makes them brighter, and widens battle rifle bands /:cl:
## About The Pull Request Reduces chrystarfish fall chance by half Fixed a bug that caused predator fish to give the aquarium pet message when out of it and vice versa Fixed flumpulus message having no span Dolphish now chomp you if you try to pet them ## Why It's Good For The Game > Reduces chrystarfish fall chance by half They fell off too fast in practice despite the chance bein tiny idk > Fixed a bug that caused predator fish to give the aquarium pet message when out of it and vice versa Bug > Fixed flumpulus message having no span Span > Dolphish now chomp you if you try to pet them They really dont like being held ## Changelog :cl: balance: Reduces chrystarfish fall chance by half fix: Fixed a bug that caused predator fish to give the aquarium pet message when out of it and vice versa fix: Fixed flumpulus message having no span add: Dolphish now chomp you if you try to pet them /:cl:
## About The Pull Request Bumps our fontawesome icons to 6.7.2. I suspicion some of these will look or work differently with 516/webview2 (perhaps how they were intended) because FontAwesome dropped IE support some time ago. ## Why It's Good For The Game Dependency bump + new icons ## Changelog :cl: add: TGUI icons are updated to latest FontAwesome version, v6.7.2. /:cl:
## About The Pull Request this prevents corgi pop, as well as some other animals like cats, from skyrocketing. there were some measures against this in the ai behavior code, but they werent working properly. ## Why It's Good For The Game fixes corgi pop skyrocketing, for the sake of performance ## Changelog :cl: fix: corgi's population will no longer exponentially grow /:cl:
## About The Pull Request Partially handles tgstation#88892 I tested with stingbangs, not throwing stars. Yeah. This does NOT solve the main issue of tgstation#88892 with jagged rods, as that would require rewriting how projectile_drop and caseless elements function ## Changelog :cl: fix: Fixed items not embedding /:cl:
## About The Pull Request - Matches can be ignited with boots. - Matches have a rare chance of failing to ignite (prompting you to try again) or an even rarer chance of snapping (wasting it). - Also makes ignition span use mostly-consistent (using rose span for the "cooler" ignition effects). ## Why It's Good For The Game You may be thinking "hey, matches won't light on just friction unless they're from the 1800s", and you'd be right. But it's a cool movie trope, which means it should be possible, I don't make the rules. ## Changelog :cl: Melbert add: You can light matches on the heel of your boots - Just don't do it too hard. /:cl:
…tation#88889) ## About The Pull Request - Makarov magazines no longer have a placeholder description from the base type. - Standardized pistol magazines' descriptions and extended descriptions for ammo types. - Repathed the gangs-era surplus rifle's magazines (these still exist? wow) from m10mm/rifle to /sr10mm so they no longer fit in Ansems. - Ammo counts from examined guns are now bolded to be slightly easier to notice at a glance. - Magazines now show ammo count on a new line.  ## Why It's Good For The Game Makarov description being an obvious placeholder bugged me and then things got out of scope. The bold ammo count thing is really small but it might come in handy for someone? Possibly? ## Changelog Surplus rifle changes not mentioned in changelog because it's unobtainable in-game and also just really bad as a gun in general. :cl: qol: Examining a gun or magazine now shows the ammo capacity in bold. spellcheck: Standardized pistol magazine descriptions, fixing Makarov magazines having a placeholder description. /:cl: --------- Co-authored-by: Hatterhat <[email protected]>
…athmatch arenas. (tgstation#88756) ## About The Pull Request Adds a new area flag, LOCAL_TELEPORT. This flag allows teleports ONLY in the same area that the teleport is used. This allows for short range hijinks without enabling long range exploits, and thus it's given to DMs and domains. Changed almost all area_flags & NO_TELEPORT checks to use check_teleport() (as now areas may use local_teleport instead, and this lets them check for multiple things instead) Thus I re-added Void Phase to the heretic scribe in DM and shuffled some stuff around (realizing now i neglected to doublecheck if blade breaking tps you to station. need to check just in case) ## Why It's Good For The Game It sucks you can't use teleporting abilities in temporary areas, so this is a good way to allow this to still happen without opening the way for gamebreaking exploits. ## Changelog :cl: code: Adds a new area flag, LOCAL_TELEPORT, given to virtual domains and deathmatch arenas. code: Re-added Void Phase to Heretic Scribes in Deathmatch's Ragnarok map. /:cl:
…88954) ## About The Pull Request OD thresholds are scaled by purity when ingested. The current scaling penalises high purity, which appears to have been a mistake, see tgstation#64028. This PR changes the scaling to favour higher purities and penalise lower ones. ## Why It's Good For The Game Properly synthesised chems, will match or exceed the listed OD threshold. Fixes tgstation#64028. ## Changelog :cl: balance: Overdose thresholds now positively scale with high purity /:cl:
## About The Pull Request OpenDream was recently bumped to .NET 9, which is not on our runner image. I added an action which installs the required .NET version for DMCompiler to function. ## Why It's Good Adding this action is not only good as a quick hack fix, but also for posterity. I also considered the impact this has on our runner execution time, but my hope is that it should not matter if we have .NET installed already.
… chat text. (tgstation#88947) ## About The Pull Request Deconverting a revolutionary now throws a balloon alert alongside the chat text. ## Why It's Good For The Game Important information we want to communicate to players needs to be on the actual game screen; otherwise it's going to get missed during heavy-chat situations. ## Changelog :cl: qol: Deconverting a revolutionary now throws a balloon alert alongside the chat text. /:cl:
## About The Pull Request A bunch of places in code were recently updated to use a helper proc for validating teleportation. Unfortunately a lot of them also got the return value inverted, and would only let you teleport to illegal locations. Most notably this effected the hand teleporter, but also several other items. Fixes tgstation#88966 what is a "dull universal force" supposed to be anyway
…h organs) on evolution. (tgstation#88861) ## About The Pull Request When a xenomorph evolves, any organs transplanted into it (that aren't the default type for that slot) get transferred to the new caste it evolves into. Additionally, If a xenomorph is missing an organ in a slot it should have one in, the caste it evolves into will also have the organ for that slot missing. Brains also always get transferred, regardless of whether they are xeno brains, so as to preserve skillchips and traumas. ## Why It's Good For The Game Improves the mechanical consistency of surgically altered xenos. ## Changelog :cl: qol: Xenomorphs that have had their organs removed, or replaced with organs they shouldn't normally have, keep those organs (or lack thereof) when evolving. fix: Xenomorphs that somehow get skillchips or brain traumas will keep them when evolving. /:cl:
## About The Pull Request This adds a hair clipper sound to the razor item used to adjust mobs beards and hairstyles. https://github.com/user-attachments/assets/dba18247-415d-42b5-9e4b-a5c73d670088 Source: https://freesound.org/people/VIPERSTRONG/sounds/655747/ License: CC0 ## Why It's Good For The Game Buzz buzz buzz ## Changelog :cl: sound: Add hair clipper sound to hair razor item /:cl:
github-actions
bot
added
TGUI
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
There was a problem hiding this comment.
The pull request #963 has too many files changed.
We can only review pull requests with up to 300 changed files, and this pull request has 332.
|
This PR causes following conflicts on translate branch: code/datums/ai/objects/vending_machines/vending_machine_behaviors.dm++<<<<<<< HEAD
+ vendor_pawn.say(pick("Supersize this!", "Eat my shiny metal ass!", "Want to consume some of my products?", "SMASH!", "Don't you love these smashing prices!"))
+ controller.set_blackboard_key(BB_VENDING_LAST_HIT_SUCCESSFUL, TRUE)
++||||||| 249961ab81a
++ vendor_pawn.say(pick("Supersize this!", "Eat my shiny metal ass!", "Want to consume some of my products?", "SMASH!", "Don't you love these smashing prices!"))
++ controller.set_blackboard_key(BB_VENDING_LAST_HIT_SUCCESFUL, TRUE)
++=======
+ vendor_pawn.say(pick("Как тебе размерчик?!", "Поцелуй мой блестящий металлический зад!", "Хочешь попробовать мои товары?", "В ЛЕПЕШКУ!", "Разве вам не нравятся эти сногсшибательные цены?!"))
+ controller.set_blackboard_key(BB_VENDING_LAST_HIT_SUCCESFUL, TRUE)
++>>>>>>> origin/translate
++<<<<<<< HEAD
+ vendor_pawn.say(pick("Get back here!", "Don't you want my well priced love?"))
+ controller.set_blackboard_key(BB_VENDING_LAST_HIT_SUCCESSFUL, FALSE)
++||||||| 249961ab81a
++ vendor_pawn.say(pick("Get back here!", "Don't you want my well priced love?"))
++ controller.set_blackboard_key(BB_VENDING_LAST_HIT_SUCCESFUL, FALSE)
++=======
+ vendor_pawn.say(pick("А ну вернись!", "Разве тебе не хочется моей хорошо оцененной любви?"))
+ controller.set_blackboard_key(BB_VENDING_LAST_HIT_SUCCESFUL, FALSE)
++>>>>>>> origin/translate
code/game/objects/structures/ladders.dm++<<<<<<< HEAD
+ . += span_info("[EXAMINE_HINT("Left-click")] it to start moving up; [EXAMINE_HINT("Right-click")] to start moving down.")
++||||||| 249961ab81a
++ . += span_info("<b>Left-click</b> it to start moving up; <b>Right-click</b> to start moving down.")
++=======
+ . += span_info("<b>ЛКМ</b> для подъема наверх; <b>ПКМ</b> для спуска вниз.")
++>>>>>>> origin/translate
code/modules/antagonists/heretic/magic/mansus_grasp.dm++<<<<<<< HEAD
+ . = span_rose("[user] effortlessly snaps [user.p_their()] fingers near [to_light], igniting it with eldritch energies. Fucking badass!")
++||||||| 249961ab81a
++ . = span_notice("[user] effortlessly snaps [user.p_their()] fingers near [to_light], igniting it with eldritch energies. Fucking badass!")
++=======
+ . = span_notice("[capitalize(user.declent_ru(NOMINATIVE))] без труда щелкает своими пальцами возле [to_light.declent_ru(GENITIVE)], зажигая мистической энергией. Чертовски круто!")
++>>>>>>> origin/translate
code/modules/antagonists/heretic/magic/star_touch.dm++<<<<<<< HEAD
+ . = span_rose("[user] effortlessly snaps [user.p_their()] fingers near [to_light], igniting it with cosmic energies. Fucking badass!")
++||||||| 249961ab81a
++ . = span_notice("[user] effortlessly snaps [user.p_their()] fingers near [to_light], igniting it with cosmic energies. Fucking badass!")
++=======
+ . = span_notice("[capitalize(user.declent_ru(NOMINATIVE))] без труда щелкает своими пальцами возле [to_light.declent_ru(GENITIVE)], зажигая мистической энергией. Чертовски круто!")
++>>>>>>> origin/translate
code/modules/projectiles/gun.dm++<<<<<<< HEAD
+ to_chat(user, span_warning("[src] is lethally chambered! You don't want to risk harming anyone..."))
+ firing_burst = FALSE
+ return FALSE
++||||||| 249961ab81a
++ to_chat(user, span_warning("[src] is lethally chambered! You don't want to risk harming anyone..."))
++ return
++=======
+ to_chat(user, span_warning("Летальный снаряд заряжен в [declent_ru(PREPOSITIONAL)]! Вы не хотите рисковать причинить кому-то вред..."))
+ return
++>>>>>>> origin/translate
code/modules/projectiles/guns/ballistic.dm++<<<<<<< HEAD
+ . += "It has <b>[get_ammo(count_chambered)]</b> round\s remaining."
++||||||| 249961ab81a
++ . += "It has [get_ammo(count_chambered)] round\s remaining."
++=======
+ . += "Внутри имеется [get_ammo(count_chambered)] патрон[declension_ru(get_ammo(count_chambered), "", "а", "ов")]."
++>>>>>>> origin/translate
code/modules/projectiles/guns/energy.dm++<<<<<<< HEAD
+ . = span_rose("[user] casually lights [A.loc == user ? "[user.p_their()] [A.name]" : A] with [src]. Damn.")
++||||||| 249961ab81a
++ . = span_danger("[user] casually lights [A.loc == user ? "[user.p_their()] [A.name]" : A] with [src]. Damn.")
++=======
+ . = span_danger("[capitalize(user.declent_ru(NOMINATIVE))] непринужденно зажигает [A.declent_ru(ACCUSATIVE)][A.loc == user ? " у себя" : ""] с помощью [declent_ru(GENITIVE)]. Емае.")
++>>>>>>> origin/translate
code/modules/vending/_vending.dm++<<<<<<< HEAD
+ build_inventory(contraband, hidden_records, create_categories_from("Contraband", "mask", contraband), start_empty, premium = TRUE)
+ build_inventory(premium, coin_records, create_categories_from("Premium", "coins", premium), start_empty, premium = TRUE)
++||||||| 249961ab81a
++ build_inventory(contraband, hidden_records, create_categories_from("Contraband", "mask", contraband), start_empty)
++ build_inventory(premium, coin_records, create_categories_from("Premium", "coins", premium), start_empty)
++=======
+ build_inventory(contraband, hidden_records, create_categories_from("Контрабанда", "mask", contraband), start_empty)
+ build_inventory(premium, coin_records, create_categories_from("Премиум", "coins", premium), start_empty)
++>>>>>>> origin/translate
|
Furrior
approved these changes
Jan 10, 2025
Gaxeer
added a commit
that referenced
this pull request
Jan 10, 2025
## Что этот PR делает Translation fix after #963 ## Summary by Sourcery Bug Fixes: - Fix firearm messages to correctly handle Russian grammar and declensions.
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.
About The Pull Request
Merge Upstream 10.01.2025