Upstream sync #2280
Merged
Upstream sync #2280
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
* Fix incorrect usage of loc string * Make it so you can no longer ahelp someone who is no longer selected
* CVarify meteor behavior * Cache value to reduce CVar calls, hook into OnValueChanged * _cfg is still null at construction time, fixed by just making it set up on Started instead * Invoke immediately! Learning more every step of the way. * Move cached value initialisation to Initialize call * Add explicit supercall
…29024) * Add a PointLight to firelocks when warnings are active * Remove power requirement for lights
…on (#29037) * make the donk microwave drop the correct board on normal deconstruction * removed the unnecessary SyndicateMicrowaveMachineBoard tag
* Mannequin * rsi license fix * damage container fix * container fix hope this works * layers fix + appearance comp (mb it help?) * maybe fixed? * one day it will work... * can't even understand why test failing... (maybe fix?) * last try?
The TEG used to limit hot-cold energy transfer based on actual power drawn, and had maximum efficiency at whatever temperature difference. This PR adjusts the hot-cold energy transfer to be uncapped, "venting" the excess heat that is not used to generate power, and adds an efficiency curve that limits efficiency at low thermal temperatures. People have been cheesing the TEG by hooking up the hot end to the CO2 miner (which produces infinite, room-temperature gas) and the cold end to a space radiator. With this change, you will actually need to set up a burn chamber in order to get appreciable power out of the TEG (see below). If you build a gas holding chamber, you will have to throttle the gas flowing into the TEG instead of constantly cycling the gas through over and over again.
…instead of the eye's (#29012)
* hell 💀 * you're right i'm dumb * use the beautiful protoid and or in localization 🥩 * 🙏
* Update ClothingSystem.cs * did it in a better way * Update ClothingSystem.cs
* Adds New Shoes to Sec loadouts * Remove Cowboy stuff from sec drobe(bye sheriff) + requested changed
…#29064) change they're to their
Co-authored-by: PJBot <[email protected]>
* Remove Explosive Component from ClothingShoesBootsMagSyndie * Makes BaseJetpack a parent of ClothingShoesBootsMagSyndie * fix boots in hand looking like jetpack bug * make syndicate magboots child of magboots
…chines: Fixes #28997 (#29071) add CAPITALIZE()
…ream-sync # Conflicts: # Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml # Resources/Prototypes/GameRules/events.yml # Resources/Prototypes/Loadouts/role_loadouts.yml # Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json # Resources/Textures/Structures/Power/apc.rsi/base.png # Resources/Textures/Structures/Power/apc.rsi/broken.png # Resources/Textures/Structures/Power/apc.rsi/channel0-auto_off.png # Resources/Textures/Structures/Power/apc.rsi/channel0-auto_on.png # Resources/Textures/Structures/Power/apc.rsi/channel0-manual_off.png # Resources/Textures/Structures/Power/apc.rsi/channel0-manual_on.png # Resources/Textures/Structures/Power/apc.rsi/channel1-auto_off.png # Resources/Textures/Structures/Power/apc.rsi/channel1-auto_on.png # Resources/Textures/Structures/Power/apc.rsi/channel1-manual_off.png # Resources/Textures/Structures/Power/apc.rsi/channel1-manual_on.png # Resources/Textures/Structures/Power/apc.rsi/channel2-auto_off.png # Resources/Textures/Structures/Power/apc.rsi/channel2-auto_on.png # Resources/Textures/Structures/Power/apc.rsi/channel2-manual_off.png # Resources/Textures/Structures/Power/apc.rsi/channel2-manual_on.png # Resources/Textures/Structures/Power/apc.rsi/display-charging.png # Resources/Textures/Structures/Power/apc.rsi/display-full.png # Resources/Textures/Structures/Power/apc.rsi/display-lack.png # Resources/Textures/Structures/Power/apc.rsi/display-remote.png # Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png # Resources/Textures/Structures/Power/apc.rsi/frame.png # Resources/Textures/Structures/Power/apc.rsi/lock0-locked.png # Resources/Textures/Structures/Power/apc.rsi/lock0-unlocked.png # Resources/Textures/Structures/Power/apc.rsi/lock1-locked.png # Resources/Textures/Structures/Power/apc.rsi/lock1-unlocked.png # Resources/Textures/Structures/Power/apc.rsi/meta.json # Resources/Textures/Structures/Power/apc.rsi/panel.png # Resources/Textures/Structures/Power/apc.rsi/static.png
github-actions
bot
added
Status: Needs Review
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
# Conflicts: # Resources/Locale/ru-RU/borg/borg.ftl # Resources/Locale/ru-RU/guidebook/chemistry/effects.ftl # Resources/Locale/ru-RU/holiday/greet/holiday-greet.ftl # Resources/Locale/ru-RU/preferences/loadout-groups.ftl # Resources/Locale/ru-RU/station-events/events/meteor-swarm.ftl
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.
Описание PR
Медиа
Проверки
Изменения