Merge upstream 04.10.24 #503
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
…hacked cigarette vending machines) (tgstation#86098) ## About The Pull Request So, do you remember orbies, those cutesy virtual PDA pets from that PR that Ben made roughly six months ago before moving on his next project, leaving them to be probably forgotten in a near future/present/past? Yeah, personally I never played around, however I recalled that they do have customizable virtual hats, which can be selected from a dropdown in the UI, and I thought that it would be a perfect target for some achievement-related content, as they're totally cosmetic that provides no gameplay advantage nor affects balance in no way whatsoever. I cannot sit well with cheevos being purely an end to itself, that's the reason this PR exists. The new additions to orbies hats, and their respective required achievements are: - The fishing hat (Legendary Fisher) - A huge-ass rollie (Unhealthy Snacks) (yeah, it isn't exactly a hat but the code in no way assume that the item has to be a hat, beside vars named like that for the sake of convenience) - A tape wizard hat (Archmage) - An energy cakehat (Very Important Piscis) - A bounty hunter cowboy hat (Hot Damn!) - A fancy crown (Outdebted) The huge-ass rollie (called fat dart) in the game, is a new cigarette, rarely found in hacked cigarette vending machines. It's obviously a reference to that Ralsei meme from 3 years ago or so but I personally don't care, I just wanted to give an excessively big cigarette to orbies to symbolize the proposterous accomplishment of eating 500 cigarettes in a single round without dying from nicotine OD less than halfway through, but since orbie hats use actual items are references for their appearance, I found myself obliged to add one to the code. Overall, the fat dart comes from an old PR on Citadel, though I had to resprite it myself. Here's a lazy collage of the hats. For some reason unbeknownst to me, the hats are horizontally squished. I need to ask Ben why he did them this way when Orbies' heads are as wide as a rugby ball.  ## Why It's Good For The Game Simple, extra cosmetic stuff for a simple feature that's as relevant as playing around with plushes. ## Changelog :cl: add: Added more customizable options to PDA virtual pets, which can be unlocked by completing achievements. add: Added a fat dart that can be rarely found in hacked cigarette vending machines. /:cl:
<!-- 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 Void conduit has been given slightly less range and the pulse affects only structures within LoS. <!-- 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 I tested this skill in game a couple of times, it's admittedly a bit overtuned, the pulse ignoring LoS leads to a lot of cheesy scenarios, like RCDing walls all around the portal while being able to space multiple areas. It's still a very good spell, just less insane. <!-- 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. --> :cl: balance: Void Conduit has less range and no longer ignores Line of Sight. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: 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. -->
## About The Pull Request Title. ## Why It's Good For The Game So the beer bottle ring uses this sprite.  But, when you open it, beer bottles. I hate magic and love consistency so now it's properly beer cans. ## Changelog :cl: fix: The Beer Sixpack no longer magically turns into bottles. /:cl:
## About The Pull Request This fixes and improves some stuff with the living heart ritual: - If you don't have any heart at all - i.e, you're a species without a heart, or have no heart due to vein muscle membrane surgery, you can still use the ritual to *put* a living heart into your chest. - Fixed a "qdeleted thing being thrown around" runtime from the ritual unintentionally deleting your old heart while dramatically throwing it out of your chest. - The ritual, when its replacing/adding a new heart to your chest, will now heal the heart to just below the "severe organ damage" threshold, if needed. It's very easy for a heart to accidentally decay without you realizing if you're butchering a monkey in maints to hastily replace your heart, especially if you accidentally forget the poppy or something and have to go sprint to get one. Fixes tgstation#71451 ## Why It's Good For The Game Consistency for edge cases is good, as well as avoiding runtimes. ## Changelog :cl: fix: Fixed the Living Heart ritual deleting your old heart when replacing it instead of having it dramatically burst out of your chest like it should. qol: The Living Heart ritual will now work if you don't have one at all for some reason, in the same way that'd you use an organic heart in the ritual to replace a cybernetic heart. qol: The Living Heart ritual, when putting a new heart into your chest, will now heal the heart enough to be just under the "severe damage" threshold, if needed. /:cl:
## About The Pull Request <details> - renamed ai folder to announcer -- announcer -- - moved vox_fem to announcer - moved approachingTG to announcer - separated the ambience folder into ambience and instrumental -- ambience -- - created holy folder moved all related sounds there - created engineering folder and moved all related sounds there - created security folder and moved ambidet there - created general folder and moved ambigen there - created icemoon folder and moved all icebox-related ambience there - created medical folder and moved all medbay-related ambi there - created ruin folder and moves all ruins ambi there - created beach folder and moved seag and shore there - created lavaland folder and moved related ambi there - created aurora_caelus folder and placed its ambi there - created misc folder and moved the rest of the files that don't have a specific category into it -- instrumental -- - moved traitor folder here - created lobby_music folder and placed our songs there (title0 not used anywhere? - server-side modification?) -- items -- - moved secdeath to hailer - moved surgery to handling -- effects -- - moved chemistry into effects - moved hallucinations into effects - moved health into effects - moved magic into effects -- vehicles -- - moved mecha into vehicles created mobs folder -- mobs -- - moved creatures folder into mobs - moved voice into mobs renamed creatures to non-humanoids renamed voice to humanoids -- non-humanoids-- created cyborg folder created hiss folder moved harmalarm.ogg to cyborg -- humanoids -- -- misc -- moved ghostwhisper to misc moved insane_low_laugh to misc I give up trying to document this. </details> - [X] ambience - [x] announcer - [x] effects - [X] instrumental - [x] items - [x] machines - [x] misc - [X] mobs - [X] runtime - [X] vehicles - [ ] attributions ## Why It's Good For The Game This folder is so disorganized that it's vomit inducing, will make it easier to find and add new sounds, providng a minor structure to the sound folder. ## Changelog :cl: grungussuss refactor: the sound folder in the source code has been reorganized, please report any oddities with sounds playing or not playing server: lobby music has been repathed to sound/music/lobby_music /:cl:
…gstation#86861) ## About The Pull Request anything and everything from ghosts to supermatter damage was getting soapbox speech, this adds a check for isliving so it only gives it to mobs ## Why It's Good For The Game bugs bugs bugs ## Changelog :cl: fix: fixes soapbox being given to non-mobs /:cl:
…ute damage; Consume action changes to Eject when a mob is consumed (tgstation#86817) ## About The Pull Request Title; instead of using 200 brute damage as a point of "victim has been digested enough", it now uses death. Should be about the same mechanically, though consuming alive humans with burn damage will puke them out sooner now, since they won't be able to accumulate as much brute damage as before. But I think it's ?fine?, it feels kinda cheesy to let the cube eat an already almost fried human patty after it expires anyway. EDIT: Consume action isn't allowing for more than one mob to be consumed at a time, and the cube didn't have a way to dispose of the mob it's consuming, so per request I changed it so the action now changes to _Eject Mob_ when you consume a mob, letting you do just that. Also fixes visible message of an attempt at consuming a mob not showing the victim's name. ## Why It's Good For The Game Fixes tgstation#53512 QoL for getting rid of the consumed victim No more devouring blank space (in the visible message) ## Changelog :cl: fix: gelatinous cubes now puke out their consume victim when said victim dies, not when it accumulates 200 brute damage (not all mobs can get damaged to that point) qol: gelatinous cube's Consume action can now be used to eject the currently consumed mob fix: fixed gelatinous cube's consume attempt not showing the victim's name properly (You start attempting to devour !) /:cl:
…r storage UI open under odd circumstances (tgstation#86842) ## About The Pull Request This is one of the stupidest issues I had the displeasure of working with and I still do not know concrete details behind the issue because some of the code introduced in this (supposed-to-be) debug PR accidentally fixed said issue. Essentially, under odd circumstances of the user either being SSD or having their storage focus stolen by something else, an observer who had their storage UI open via autoobserve could break their UI by moving away because that improperly removed the user from some lists. This is the primary theory judging from what fixed the issue, but sadly there is no concrete info behind it as all attempts to reproduce the bug, both locally and on live, have failed. Closes tgstation#85259 ## Changelog :cl: fix: Storage UI should no longer (not so much) randomly disappear, hooray! /:cl:
(This folder doesn't even exist anymore)
## About The Pull Request This pull request fixes the link you get redirected to when you click the "Rules" button on the top right of the game. Before it redirected to http://www.tgstation13.org/wiki/Rules but the correct link is http://tgstation13.org/wiki/rules (the www part is the problem). ## Why It's Good For The Game Makes the rules button direct you to the correct link, making it easier for someone to view the rules of the server. ## Changelog :cl: fix: fixed link for the rules button /:cl:
…ation#86845) ## About The Pull Request Little oopsie since I've forgot that time is in deciseconds for a moment there, therefore it should be multiplied by 0.13 and not 1.3 ## Why It's Good For The Game I made a mistake. ## Changelog Too small to add to the CL.
…cluding nulls (tgstation#86866) ## About The Pull Request Previously the imaginary friend greeting message would be called on `Login()`, but this meant that it could run before it actually linked the `owner` value, thus putting nulls in the message where the owner's name should've been. This just changes it so `greet()` is only called on `Login()` if there's already an owner linked, otherwise calling it when being attached to an owner. ## Why It's Good For The Game Better if the greeting message actually says whose imaginary friend you are. ## Changelog :cl: fix: The greeting message imaginary friends get upon becoming one actually includes the owner's name, instead of displaying nothing where it should've been. /:cl:
…ion#86846) ## About The Pull Request all audible emotes share a cooldown now, that means, for example: emoting `*scream` will play a sound, then emoting `*cry`, if the cooldown for `*scream` hasn't passed, will not play a sound for the `*cry`, but will still play the emote. Note - all audible emotes have a default audible cooldown of 2 seconds, unless overriden on some emotes. ## Why It's Good For The Game - prevents people from spamming multiple audio emotes in quick succession. - allows us to add more emote sounds without fear of players abusing them for spam. - less audio from emotes makes the audible emotes more special and less ear-fatigue-ing - forces players to be more considerate with what audible emote they use, increasing quality of their usage for roleplay.
## About The Pull Request Fixes this runtime:  `account_job` can in fact be null it seems, and that should be taken into account. ## Why It's Good For The Game Fixes oversight ## Changelog Nothing player facing (probably?)
…suit (tgstation#86705) ## About The Pull Request Trying to cable heal as an Aug while not wearing a jumpsuit makes you cable whip yourself. This fixes it so that you can cable heal even if you're chrome-ass naked. ## Why It's Good For The Game Bugfix ## Changelog :cl: Bisar fix: Fixes augs not being able to heal with cables if they're naked or going commando. /:cl:
## About The Pull Request Washing now give you status effect that regen 4 stamina per tick. https://github.com/user-attachments/assets/1691ac4b-d8e4-402a-98d1-3cba61c00879 BUT if you felinid you will loss 4 stamina insteed becouse cats don't love water. https://github.com/user-attachments/assets/e566e4d8-7f8a-47e6-aadc-b2910758d6ea ## Why It's Good For The Game Gives more reasons to wash. ## Changelog :cl: add: Showers now heals stamina when you washing. But not for you catgitls. /:cl: --------- Co-authored-by: MrMelbert <[email protected]>
…h of stuff (tgstation#86884) ## About The Pull Request We have the HIDEBELT flag but it isn't used anywhere and in fact is not functional, so I added code to examine to enable it. I also threw the flag onto a bunch of stuff -- primarily big billowy things, or stuff like trenchcoats. This would include hiding guns, toolbelts, plant bags, things of that nature. If you steal the Captain's saber and throw a bedsheet on your head, you've pulled off the perfect crime. ## Why It's Good For The Game Adds another way to be sneaky and immensely suspicious, increasing paranoia when some guy wearing a big shapeless suit walks into the room.  ## Changelog :cl: Bisar add: Clothing can now hide what you're wearing on your belt. /:cl:
…adows from blood and runes) (tgstation#87013) ## About The Pull Request Basically goes through and puts some flat objects onto the floor plane. Also puts blood back on the floor plane, since it seems like it used to be but may have been moved mistakenly questionmark. This means they will not be affected by Ambient Occlusion:  ## Why It's Good For The Game A lot of these "flat" things look really out of place because they're secretly "floating" due to being on the wrong plane ## Changelog :cl: Melbert qol: Runes, crayons, and similar decals no longer have shadows fix: Blood and similar "mess" decals no longer have shadows (again) /:cl:
## About The Pull Request Some QoL changes for cargo, mostly just with the goal of cutting down on the sheer amount of airlocks in cargo. I also added a small cargo lobby to aid in pushing the ORM a tad closer to the miners and cutting down on the airlocks in and out of cargo. ## Why It's Good For The Game Less claustrophobic, more space. The changes are very minor, just small changes to the layout without completely overhauling it. You can see the changes below.  re-added dnd room:  new cargo lobby area:  the freed up space:  ## Changelog :cl: add: Birdshot Cargo now has a lobby and is slightly more open overall. add: Re-added the DnD room to Birdshot add: re-added the skill station to the library. /:cl: --------- Co-authored-by: Ghom <[email protected]>
github-actions
bot
added
Документация
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
Мергируем апстрим