Merge upstream 14.10.24 #573
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
…on#87086) ## About The Pull Request Completely refactors plasmaman code by moving their self-ignition code to limbs via a component and making suits handle their extinguishing code by themselves. This means that if someone gets a plasmaman limb attached to them, they'll need to seal it off from oxygen or it will ignite! ## Why It's Good For The Game Plasmaman code is really bad and we've been trying to move away from species specific code and make them just limb and organ containers Closes tgstation#52649 ## Changelog :cl: fix: Plasmaman space suit internal extinguisher works and can be refilled now refactor: Refactored plasmamen self-ignition to be limb-side instead of being handled by their species /:cl:
## About The Pull Request - pet bonus element now works by getting an emote fed into it. - all pets who had pet bonus emotes now have it as a proper emote they can use if controlled by a player. ## Why It's Good For The Game - standardises pet bonus so it's easier to give more behaviors to petting, like sounds :3 - allows basic mobs controlled by players to use the emote at will, which will allow them to react to situations more with emotes. ## Changelog :cl: grungussuss add: a lot of basic mobs and pets got new emotes refactor: emotes triggered by petting pets work differently now, please report any oddities with these behaviors. sound: new emotes for basic mobs got sounds /:cl:
## About The Pull Request  ## Changelog :cl: grungussuss fix: snore emote works properly now /:cl:
…n#87160) ## About The Pull Request this was changed a few weeks back but wasnt actually intentional. ## Why It's Good For The Game fixes ashdrake arena attack not clearing out lavaland walls ## Changelog :cl: fix: fixes ashdrake arena attack not clearing out lavaland walls /:cl:
## About The Pull Request Centcom forced an intern to run the spell-checker for faxes sent to stations working within a radioactive nebula ## Why It's Good For The Game spell good ## Changelog :cl: spellcheck: Proofreads some faxes sent during radioactive nebulae /:cl:
## About The Pull Request Closes tgstation#87181 ## Changelog :cl: fix: Untie shoes should have its cooldown increased correctly when casting it from a long distance /:cl:
…#87164) ## About The Pull Request flags the automatic, end of round map votes as `forced`, as they were previously. ## Why It's Good For The Game democracy is mandatory in this household ## Changelog not player facing
## About The Pull Request Partially improves: * tgstation#46002 Previously, the ghost's "t-ray view" acted as a toggle, even though the scan only occurred once. This PR changes it to function as an action rather than a toggle, removing the need to press the button twice. While the ideal solution would be for the t-ray scan to work on the process tick, my attempt to give ghosts their own t-ray scanner and to toggle it on upon using the verb did not work as expected because the scanner didn't recognize the ghost as its holder (`mob/viewer` in the code). This update serves as an improvement to the current behaviour, but in the future, the t-ray scan verb should function like a normal t-ray scanner, instead of just a one-time scan. ## Why It's Good For The Game Improves the t-ray verb, before it acted as a toggle even though it only worked once upon toggling on. Improves user experience using this verb. ## Changelog :cl: fix: the ghost "t-ray view" no longer requires a double press to activate a second time. qol: renamed "t-ray view" to "t-ray scan" for clarity. /:cl:
…hed off (tgstation#87102) ## About The Pull Request Gas masks and all their subtypes no longer have fov. Using pepperspray on gas mask wearer applies 1 tint per 5u of spray. At 3 tint the wearer becomes fully blind. If you wanna use the mask again you'll have to wash off the pepperspray from it using soap or shower. ## Why It's Good For The Game Gas mask assistants are peak soul and removing it was a terrible disaster. FoV is too annoying to ever deal with, so it ends up with gas masks never being worn. Gas filter doesn't make up for it whatsoever, it's only use is shoving cigarettes in it to look cool. This PR makes it so pepperspray/tear gas is still useful against mask wearers, albeit less efficient.
…g objects are edible and have the GORE food type. (tgstation#87154)
…station#86068) This was discussed in #maintainerbus on the Discord. @tgstation/commit-access Result of this PR: - Add the `Discord Discussion` label to the PR. - The bot will create the thread, link it in the PR, and lock the PR. Slowmode set to 1 minute. Auto-archive duration set to max of 1 week. - The thread will be archived if the PR is merged or closed, unarchived if it's reopened. - You can also set a join link for the Discord to appear in the GitHub comment. I'll be setting it to our official link at https://tgstation13.org/phpBB/viewforum.php?f=60   Let the bikeshed commence
…rder console (and paramed heirloom) (tgstation#87110) Co-authored-by: SmArtKar <[email protected]>
…ro and ash mutations are no longer subtypes (tgstation#87144)
…station#87185) ## About The Pull Request p_Theyve is not suited for this. ## Changelog :cl: spellcheck: Fixed a typo in multiple lives component /:cl:
Co-authored-by: SmArtKar <[email protected]>
## About The Pull Request Closes tgstation#87192 ## Changelog :cl: fix: Ghosts can no longer cut people's tethers /:cl: --------- Co-authored-by: Ben10Omintrix <[email protected]>
## About The Pull Request https://github.com/user-attachments/assets/2452d573-ad7b-4cef-bc70-ef4aeefcb0fe https://github.com/user-attachments/assets/e5df7d93-c2c8-408a-8437-80e4abee88d9 ## Why It's Good For The Game more handling sounds ## Changelog :cl: grungussuss sound: gas analyzer now has handling sounds /:cl:
…n#87204) ## About The Pull Request title, adds a infusion entry for lizard basic mobs. ## Why It's Good For The Game it is a glaring oversight lizards dont give lizard stuff. i mean come on. moths do, cats do, the same reasons apply. ## Changelog :cl: add: you can use lizards to get lizard organs in the dna infuser /:cl:
I wrote this expecting that there would be more broken versions in the distant future, so we could simply re-use this block for those But I forgot this will most likely be seen by fresh contributors or people who don't even contribute and are just testing things So I'm just making the message as explicit as possible
## About The Pull Request This PR makes it so mechs don't play footsteps twice diagonally, and also play the turn sound only when the sprite turns. No more ear blasting when walking diagonally! ## Why It's Good For The Game It enhances the sound design by ensuring mechs no longer play footsteps twice when moving diagonally and that the turn sound only plays when the sprite actually turns. ## Changelog :cl: fix: fixed mech step sound playing twice diagonally fix: fixed turn sound playing every time you move diagonally, now only plays when the sprite turns /:cl: --------- Co-authored-by: Ghom <[email protected]>
…t, and a quirk to spawn with it. (tgstation#87082) ## About The Pull Request Added the FOSBURY skillchip, found in hacked toy vendors. This skillchip allows you to bypass the emote cooldown when flipping or spinning. However, if used too often, it will lower the chip's integrity. At first, this is harmless, emitting sparks only, but at a certain point, your head starts smoking, your brain begins short-circuiting, and once the chip has lost all integrity your head will explode in a shower of gore, giving you a cranial fissure! Added the Chipped quirk. It allows you to spawn with one skillchip. Of note here is that the only chips you can spawn with are the 'default' skillchips found in the toy vendor, you can NOT spawn in with the fosbury chip or with the musical one. Added the Chip Connector quirk. It contains a new implant, the chip connector, which allows you to install and take out skillchips at any time. Being EMPed will cause it to drop one random skillchip, and if you try using it while it's malfunctioning you'll take out a bit of your brain instead. It can also be made at the exosuit fabricator after basic research. Renamed the organ slots for brain implants and made the connector implant take the CNS slot. ## Why It's Good For The Game > Added the FOSBURY skillchip, found in hacked toy vendors. This skillchip allows you to bypass the emote cooldown when flipping or spinning. However, if used too often, it will lower the chip's integrity. At first, this is harmless, emitting sparks only, but at a certain point, your head starts smoking, your brain begins short-circuiting, and once the chip has lost all integrity your head will explode in a shower of gore, giving you a cranial fissure! During the time flipping was bugged to have no cooldown or delay, it was really funny seeing people flip at increasingly higher speeds. Many people miss it, and to be honest, so do I. But everything needs limits or it stops being funny and ends up being overdone. To this end this skillchip lets people relive those days of glory, until they go out in a beautiful explosion. The chip will last a very long while if well taken care of, and there are plenty of warning signs before it gets too risky to use, but we know what players are actually gonna do, and I am looking forward to it. > Added the Chipped quirk. It allows you to spawn with one skillchip. Of note here is that the only chips you can spawn with are the 'default' skillchips found in the toy vendor, you can NOT spawn in with the fosbury chip or with the musical one. Chips can be kind of neat sometimes, and I think always having one as part of your character can make for some fun things as the consistency of it makes it more likely to stick in your mind to do stuff with. > 'but can't you just go to the vendor at the start of every shift?' Sure. But we have loadouts. We have tagger, musician, and many other things that are 'roundstart bloat', and while that by itself is not an excuse, it's part of the design of character setup: Minimizing the time spent running around the station for things your character is supposed to have for their personality/roleplay/gimmick. They're paying the cost of quirk points for it, anyways. > Added the Chip Connector quirk. It contains a new implant, the chip connector, which allows you to install and take out skillchips at any time. Being EMPed will cause it to drop one random skillchip, and if you try using it while it's malfunctioning you'll take out a bit of your brain instead. It can also be made at the exosuit fabricator after basic research. I like the idea of having a gross usb drive on the back of your brain that you shove chips into and out of, especially if it drops pieces of your brain when malfunctioning. It also adds a little bit of extra relevance to skillchips now that you don't need to spend 15 (!!!) seconds inside a skillstation to add one. The cost is, as stated, quite literally losing your brain on EMP's and the moderately expensive sum of 4 points. > Renamed the organ slots for brain implants and made the connector implant take the CNS slot. It annoys me that there were organ slots for 'anti drop implant'. Now they're just slots for anything meant to connect to the cerebellum/central nervous system, making it less brute forcey and also adding the start of some fun exclusivity between brain implants. ## Changelog :cl: add: Added the FOSBURY skillchip, found in hacked toy vendors. This skillchip allows you to bypass the emote cooldown when flipping or spinning. However, if used too often, it will lower the chip's integrity and cause malfunctions. add: Added the Chipped quirk. It allows you to spawn with one base skillchip. (not the one above) add: Added the Chip Connector quirk. It contains a new implant, the chip connector, which allows you to install and take out skillchips at any time. code: Renamed the organ slots for brain implants and made the connector implant take the CNS slot. --------- Co-authored-by: Ghom <[email protected]>
…ord announces (tgstation#87179) Just a guess, but i think basil being down is why this isn't working.
github-actions
bot
added
TGUI
|
This PR causes following conflicts on translate branch: code/datums/mutations/hot.dm++<<<<<<< HEAD
+ desc = "Allows the user to concentrate nearby heat into a pile of ash. Wow. Very interesting."
+ quality = POSITIVE
+ text_gain_indication = span_notice("Your hand feels warm.")
+ instability = POSITIVE_INSTABILITY_MINOR
+ difficulty = 10
+ synchronizer_coeff = 1
++||||||| e5991546b34
++ desc = "Allows the user to concentrate nearby heat into a pile of ash. Wow. Very interesting."
++ text_gain_indication = span_notice("Your hand feels warm.")
++=======
+ desc = "Позволяет обладателю мутации сконцентрировать рядом находящееся тепло в кучу пепла. Вау. Очень интересно."
+ text_gain_indication = span_notice("Твоя рука кажется тёплой.")
++>>>>>>> origin/translate
++<<<<<<< HEAD
+ desc = "Draws positive energy from the surroundings to heat surrounding temperatures at subject's will."
+ quality = POSITIVE
+ text_gain_indication = span_notice("Your hand feels hot!")
+ instability = POSITIVE_INSTABILITY_MODERATE
+ difficulty = 12
+ synchronizer_coeff = 1
+ energy_coeff = 1
++||||||| e5991546b34
++ desc = "Draws positive energy from the surroundings to heat surrounding temperatures at subject's will."
++ text_gain_indication = span_notice("Your hand feels hot!")
++=======
+ desc = "Притягивает положительную энергию окружения для повышения температуры вокруг субъекта."
+ text_gain_indication = span_notice("Твоя рука кажется горячей!")
++>>>>>>> origin/translate
code/modules/mob/living/basic/space_fauna/carp/carp.dm++<<<<<<< HEAD
+ AddElement(/datum/element/pet_bonus, "bloop")
++||||||| e5991546b34
++ AddElement(/datum/element/pet_bonus, "bloops happily!")
++=======
+ AddElement(/datum/element/pet_bonus, "радостно булькает!")
++>>>>>>> origin/translate
code/modules/mob/living/carbon/inventory.dm++<<<<<<< HEAD
+ balloon_alert_to_viewers("offers something")
+ visible_message(span_notice("[src] is offering [offered ? "[offered] " : ""][offered_item]."), \
+ span_notice("You offer [offered ? "[offered] " : ""][offered_item]."), null, 2)
++||||||| e5991546b34
++ visible_message(span_notice("[src] is offering [offered ? "[offered] " : ""][offered_item]."), \
++ span_notice("You offer [offered ? "[offered] " : ""][offered_item]."), null, 2)
++=======
+ visible_message(span_notice("[capitalize(declent_ru(NOMINATIVE))] предлагает [offered ? "[offered.declent_ru(DATIVE)] " : ""][offered_item.declent_ru(ACCUSATIVE)]."), \
+ span_notice("Вы предлагаете [offered ? "[offered.declent_ru(DATIVE)] " : ""][offered_item.declent_ru(ACCUSATIVE)]."), null, 2)
++>>>>>>> origin/translate
|
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
мерге апстим