Merge upstream 03.12.24 #838
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
…8313) ## About The Pull Request Currently all carbons are able to meow and purr using the new Felinid tongue exclusive emotes. I'm changing how it works so it properly denies anyone without Felinid tongues from using the emotes. Mimes also will not be able to use the emote sounds so they stay silent. Lastly, there was a delay for the emotes on their first use where the player had to use them twice for it to work and I've fixed that, and I also removed some redundant text warnings for when you can't use the emote. Edit: The Purr emote has been tweaked so that it isn't a visible emote and deaf players can't see it when it's used. Mimes can't purr anymore because it has no visible components so they shouldn't be able to. ## Why It's Good For The Game Every carbon meowing and purring is really bad, and it was only approved to work for Felinids. This PR will rectify that. Multiple fixes and tweaks to how this emote should function are also huge positives. :cl: fix: Only players with Felinid tongues get to meow and purr for real this time, and other carbons cannot fix: Mimes can no longer meow out loud and have their own mime message fix: Stopped delay on meow and purr emotes where they had to be used twice to work the first time they're used del: Removed redundant text warning for players that can't use the meow or purr emotes tweak: Purring is no longer audible to deaf players tweak: Players with vow of silence can't purr anymore /:cl:
…station#88314) ## About The Pull Request Wallem liked the proposed recolor so much that the PR was merged as soon as it was seen! Which is really good for my confidence; However, it was not yet committed. ## Why It's Good For The Game  This is the actual intended icon from tgstation#88265 ## Changelog See tgstation#88265
## About The Pull Request It seems the abductor tech `required_items_to_unlock` assumed that subtypes of the given typepaths were included. This is not the case - as a result, things like the abductor device circuit boards, mental interface device, silencer, science tool, and omnitool would not unlock alien tech in the experimentor.. ## Why It's Good For The Game stuff working as intended is good. ## Changelog :cl: fix: Abductor doohickeys (i.e abductor device circuit boards, mental interface device, silencer, science tool, and omnitool) now properly unlock alien tech via the experimentor. /:cl:
## About The Pull Request The recloaking timer of the Wraith module has been bumped from 5 to 20 seconds. It now decloaks the user on any type of bump, or if you shoot your gun. The module is now incompatible with armor booster module (Blood red and Elite) ## Why It's Good For The Game I originally created this to provide traitors a tool to better setup ambushes and engage in stealth play. It was never really meant to be used as Combat camo like Ling darkness adaptation. Lastly the combination of full Eva + stealth is a bit bloated; fighting an invisible man in space is not fun. ## Changelog :cl: balance: Wraith Module recloaking timer bumped from 5 to 20 seconds. balance: The Wraith Module's cloak now dissipates on ranged attacks and any type of bump. balance: Wraith Module can no longer be installed In suits with the armor booster module . /:cl: --------- Co-authored-by: Xander3359 <[email protected]>
## About The Pull Request Moved all the icon_state setting logic of the broadcast camera to `update_icon_state`, rather than setting it manually on (de)activation, and resetting it to inactive in `update_icon_state` ## Why It's Good For The Game Makes things more consistent. ## Changelog :cl: fix: Made the broadcast camera's sprite more consistent, it hopefully shouldn't reset to the inactive sprite while recording in some weird scenarios now. /:cl:
## About The Pull Request Closes tgstation#88166 ## Changelog :cl: fix: Fixed smoker addictions not refreshing /:cl:
## About The Pull Request Fixes borg light not turning off when flashed because the on_apply was updating the icons before the status was added.  ## Why It's Good For The Game Lets people know the borg is stunned ## Changelog :cl: fix: Borg lights not turning off when flashed or empd /:cl:
…gstation#88308) ## About The Pull Request Closes tgstation#87751 ## Changelog :cl: fix: Fixed Hilbert's rigged analyzer not being able to scan the hotel orb /:cl:
…gstation#88224) ## About The Pull Request This got reverted with the wallening I think. Adding it again ## Why It's Good For The Game Air alarm icons update whenever area alarms are cleaned ## Changelog :cl: fix: Air alarms stuck in warning state when area alarms are cleared /:cl:
## About The Pull Request Commission plaques were outdated, so they needed updating. This adds Wawa's merge date, which was not present, moves Northstar's to the removed station list, and adds one for Nebulastation. I also alphabetized the current map list to be in line with the removed list. No map edits were made. ## Why It's Good For The Game Just keeping things up to date ## Changelog :cl: spellcheck: Station commission plaques (the gold ones that have the date they were added) have been updated, adding Nebula's, fixing Wawa's, and decommissioning Northstar's. /:cl:
## About The Pull Request Forgot .dir during the proj refactor, yikes. ## Changelog :cl: fix: Fixed all parried projectiles only going up or down /:cl:
## About The Pull Request Improper tags were being passed around which left a blank menu on player's side and a bunch of runtimes on server's side ## Changelog :cl: fix: Fixed "Leave Body" escape menu tab runtiming /:cl:
Updates slime potion sprites, adds some new colors and rearranges some others.
## About The Pull Request Detomatix doesn't pass the ``bomb`` arg to ``log_bomber`` for a rather obvious reason, and admin messaging code takes that into account. Not the check that allows that code to run though, that part just runtimes. Admins should probably be actually informed about players using detomatixes, yeah.
github-actions
bot
added
🖌️ Спрайты
|
This PR causes following conflicts on translate branch: code/modules/escape_menu/leave_body.dm++<<<<<<< HEAD
+ null,
+ /* hud_owner = */ null,
+ "Suicide",
+ "Perform a dramatic suicide in game",
++||||||| aad92bad89d
++ src,
++ "Suicide",
++ "Perform a dramatic suicide in game",
++=======
+ src,
+ "Откиснуть",
+ "Выйти из тела драматичным образом",
++>>>>>>> origin/translate
++<<<<<<< HEAD
+ null,
+ /* hud_owner = */ null,
+ "Ghost",
+ "Exit quietly, leaving your body",
++||||||| aad92bad89d
++ src,
++ "Ghost",
++ "Exit quietly, leaving your body",
++=======
+ src,
+ "Призрак",
+ "Тихо выйти из тела в призраки",
++>>>>>>> origin/translate
++<<<<<<< HEAD
+ null,
+ /* hud_owner = */ null,
+ "Back",
++||||||| aad92bad89d
++ src,
++ "Back",
++=======
+ src,
+ "Назад",
++>>>>>>> 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
мерге