Merge upstream 25.11.24 #805
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 bro its a hammer (speaking of, i feel like it should fit on the toolbelt & be a crowbar. but that's basically 1:1 the preexisting claw hammer, idk) ## Why It's Good For The Game bro it's a hammer. ## Changelog :cl: qol: carpenter hammer fits on belt slot code: renames belt_icon_state to inside_belt_icon_state for intelligibiility /:cl:
…#88084) ## About The Pull Request Somewhat of a port of ParadiseSS13/Paradise#26401, albeit re-done from scratch (with the power of find and replace) Caller is a protected/reserved var in 516. We use it a lot. It's used in more places than this, but I'm a perfectionist and can't think of better names for most of the other uses (mostly mob AI, holocall, and `InterceptClickOn` related), so I'm just doing pathfinding for now. ## Why It's Good For The Game Prep for compiling on 516 ## Changelog No user-facing changes - this is merely renaming vars.
## About The Pull Request This can be called after victim gets qdeleted from bodypart cleanup, runtimes here prevent wound from cleaning itself up which in return prevents the bodypart from deleting properly. ## Changelog :cl: fix: Fixed a runtime in cranial fissure remove code /:cl:
## About The Pull Request This PR adds a small, pre-canned virus to the game, the "Localized Weightloss Malfunction" virus, or weightlessness virus. Weightlessness is a weak contact virus that can only spawn due to randomized virus spreading virus. The virus itself applies weightlessness via having the mob produce their own internal supply of gravitium, resulting in a lack of control from gravity. This is a bit of a patch job, and if we'd like to make this apply a more specific status debuff that can be managed, but this works well enough for proof of concept anyway.  The disease is cured via liquid dark matter, but has a reasonable chance to self-cure as well similar to most diseases do nowadays. ## Why It's Good For The Game Seemed like an interesting mechanical intersection, and while it can be frustrating, it is by no means a round removal virus. It is debilitating enough that it would necessitate a medbay visit. Liquid dark matter also serves as a occasional grenade chemical, but giving it a medical use provides another inch of plausible deniability. I made this PR a little bit ago on a whim, and it's been sitting on my repo for a hot second here, so I thought I'd get this moving if there's no major issues.
## About The Pull Request Lil cleanup/tweak I couldn't do in the main PR because it conflicted before and i forgot after. Yes this works with overrides that don't have the arg, yes I tested it. ## Why It's Good For The Game Don't run armor code thrice please thank you ## Changelog :cl: code: Projectile impacts no longer fetch mobs' armor values thrice /:cl:
## About The Pull Request Prevents ghost from emitting analyzing sounds when using the gas scan verb ## Why It's Good For The Game Fixes a little bug ## Changelog :cl: Hardly fix: Ghosts can no longer emit spooky analyzing sounds when scanning /:cl:
## About The Pull Request Didn't even know they had this until it stopped lighting. While it has fuel, it says it has x fuel out of its maximum. When empty, it says what to refuel it with (welder fuel)  <details><summary>(For reference, Welders have something similar) </summary>  </details> I do not know how to set up math to make this number more useful; it tends to burn .25 units ever few seconds but beyond that it's just numbers and I'm not the best with numbers. At the least you can see if it's full or empty. ## Why It's Good For The Game This mechanic is not shown to players in any way besides the lighter not lighting. ## Changelog :cl: qol: added an examine note to lighters showing their fuel /:cl: --------- Co-authored-by: Fikou <[email protected]>
…an manipulation (tgstation#88164) ## About The Pull Request Thankfully this runtime didn't actually do anything whatsoever but it still messed in the logs. I'll test my stuff better I guess? ## Changelog :cl: fix: Fixed a (non-player facing) runtime in organ manipulation surgery /:cl:
… you can now rename ur raptors (tgstation#88153) ## About The Pull Request after my PR removing most self-registering attack signals, raptors would sometimes break their troughs after interacting with it, this fixes that. Also, removes the troublesome trait from raptors. raptors with this trait would go out and harm other raptors everyonce in a while, but ive discovered that this can be annoying to deal with when you have many of them, so ive removed it and im going to replace it with something less annoying in the future. Also you can now give your raptors pet collars, effectively allowing u to rename them ## Why It's Good For The Game fixes raptors breaking their trough and provides some QOL to raptor ranching ## Changelog :cl: fix: raptors no longer break their trough upon interacting with it balance: removed the troublesome trait from raptors, they now wont go out to attack their colleagues. add: you can now give pet collars to ur raptors to rename them /:cl:
## About The Pull Request Closes tgstation#88193 ## Changelog :cl: fix: Ensures that if your brain is removed you die /:cl:
github-actions
bot
added
the
🙏 Слияние с восходящим потоком
|
This PR causes following conflicts on translate branch: code/modules/mob/living/carbon/alien/alien_defense.dm++<<<<<<< HEAD
+ AdjustStun(-6 SECONDS)
+ AdjustKnockdown(-6 SECONDS)
+ AdjustImmobilized(-6 SECONDS)
+ AdjustParalyzed(-6 SECONDS)
+ AdjustUnconscious(-6 SECONDS)
+ AdjustSleeping(-10 SECONDS)
+ visible_message(span_notice("[user.name] nuzzles [src] trying to wake [p_them()] up!"))
++||||||| e1dda5330f4
++ AdjustStun(-60)
++ AdjustKnockdown(-60)
++ AdjustImmobilized(-60)
++ AdjustParalyzed(-60)
++ AdjustUnconscious(-60)
++ AdjustSleeping(-100)
++ visible_message(span_notice("[user.name] nuzzles [src] trying to wake [p_them()] up!"))
++=======
+ AdjustStun(-60)
+ AdjustKnockdown(-60)
+ AdjustImmobilized(-60)
+ AdjustParalyzed(-60)
+ AdjustUnconscious(-60)
+ AdjustSleeping(-100)
+ visible_message(span_notice("[capitalize(user.declent_ru(NOMINATIVE))] трется головой об [declent_ru(ACCUSATIVE)], пытаясь [ru_p_them()] разбудить!"))
++>>>>>>> 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
Мерге