Merge Upstream 20.01.2025 #1028
Open
+1,026
−541
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
![ss220app[bot]](https://avatars.githubusercontent.com/u/131299570?s=60&v=4){kind=small}
## About The Pull Request This PR makes is so that if the air is hot enough to trigger a fire door to close, grillable foods left out in the open will grill themselves. I picked the minimum grilling temperature essentially at random because I don't know what heat units are or should be, but the define `FIRE_MINIMUM_TEMPERATURE_TO_EXIST` sounded about right. IMPORTANT NOTE: **All foods are grillable by default** and become "burned mess" after about 30 seconds. If this seems like too much of a grief vector (a significant fire in the kitchen may cause all food to grill itself into oblivion) I can make this optional rather than a default-enabled thing on all food. IDK whether or not this matters, because all food is also flammable. Food will only grill based on air temperature if it is set out on an open tile (including while on a table), not while in your hands or backpack or pockets or a closet or inside an oven or (oddly enough) while on a grill. ## Why It's Good For The Game it increases my emulsion if eggs can fry on a hot sidewalk ## Changelog :cl: add: Eggs (and all other edible food) left in a hot place will fry. /:cl:
## About The Pull Request Makes it so strange geysers now say their name when scanned. ## Why It's Good For The Game Should help make geysers actually worthwhile now that it's easier to tell what they produce. ## Changelog :cl: qol: Strange geysers now say in their name what they produce. /:cl:
…#89100) ## About The Pull Request This prevents mobs with `MOB_SIZE_SMALL` or `MOB_SIZE_TINY` from triggering squeak sounds on crossed. Simple enough. Also made the cooldown use the cooldown macros. ## Why It's Good For The Game Small or tiny mobs are, well, tiny, and wouldn't really be able to trigger the same kinda reaction. Also sound spam is universally bad, and this gets rid of another method of sound spam. ## Changelog :cl: qol: Small and tiny mobs no longer trigger squeaking objects when walking over them. /:cl:
…gstation#89122) ## About The Pull Request This PR adds several circuit features, and changes several assembly-related features to make them a bit more logical in how they work. Included are the following changes/additions: - Assemblies and wires have been refactored with vars that describe their behavior: - Assemblies have an `assembly_behavior` bitflag instead of a `attachable` var. This var has 3 flags: - `ASSEMBLY_INPUT`: The assembly is able to pulse the wire it is attached to. - `ASSEMBLY_TOGGLE_ARMED`: On activation, the assembly toggles whether it can pulse the wire it is attached to. - `ASSEMBLY_FUNCTIONAL_OUTPUT`: On activation, the assembly does something other than just toggling whether it's armed. - Wires have a `wires_behavior` bitflag with 3 flags: - `WIRES_INPUT`: The object the wires are attached to does something when the wires are pulsed. - `WIRES_TOGGLE_ARMED`: The object the wires are attached to can activate assemblies attached to those wires, and is fine if all that activating that assembly does is toggle whether it's armed. - `WIRES_FUNCTIONAL_OUTPUT`: The object the wires are attached to expects that assemblies attached to its wires do something other than toggling themselves when activated. - Buttons can only accept assemblies with `ASSEMBLY_FUNCTIONAL_OUTPUT`. - Pressure plates can now accept any assembly with `ASSEMBLY_FUNCTIONAL_OUTPUT`, not just signalers. Assembly shells attached to pressure plates will draw power from the powernet if the pressure plate is under a tile. - Adds a new circuit component - the wire bundle. - This component gives the circuit a number of wires corresponding to the size of the shell. - Each wire has a corresponding port on the component that can pulse, and receive pulses from, that wire. - A circuit can only have one wire bundle component. - Assembly shells cannot be attached to these wires, and no wires will be created if the component is added to an assembly shell. - Available with roundstart tech. - Adds two new shells. - The wallmounted shell is a large shell that can be hung on walls, and uses power from the area it's placed in. - Frame icon:  - Constructed icon:  - The undertile shell is a small shell that only works when fit under a floor tile, but uses power from the area it's placed in.  - Both shells support usb cables. - The above shells are available with the Advanced Shells techweb node. ## Why It's Good For The Game The wire bundle component complements the functionality of the assembly shell by allowing circuits to use assemblies directly in their logic. The wallmounted and undertile shells provide ways of placing circuits that don't necessarily take up space for machines. The undertile shell is particularly useful for relaying usb component data over wirenets. Pressure plates being able to accept assemblies other than signalers expands their uses significantly. ## Changelog :cl: refactor: Wires and assemblies have been refactored to have directionality to them. This mostly makes it so that assemblies can only be attached to wires it would make sense for them to be attached to. qol: Pressure plates can now also accept igniters, condensers, flashes, assembly shells, and door controllers. add: Undertile circuit shells. They only work when placed under floor tiles, but support USB cables and use APC power instead of cell power. add: Wallmounted circuit shells. Large shells that support USB cables and use APC power instead of cell power. add: Wire bundle component. Adds a number of wires to the circuit proportional to the capacity of the shell, allowing you to use assemblies in circuit logic. /:cl:
## About The Pull Request There was no mechanical version of the coronary bypass and then I checked the code. ## Why It's Good For The Game Its a little fix ## Changelog :cl: fix: Fixed Engine Diagnostic surgery /:cl:
## About The Pull Request mimics are basicmobs now the only change not carried over worth mentioning is that all mimics are a consistent speed because i cant imagine a gun or object with aimbot going at you mach 2 would be very fun mimic crates had some stuff changed compared to their simple animal variant they open and close their lid when attacking (unless locked) to be like menacing or something like animals flash colors to ward off people attempting to open a nonsentient hostile crate mimic will make it lock itself (if it contains anything) and attack you mimics are a really stupid naming for these because like mimic crates pretend to be crates anything else inheriting from mimics are just used to make objects alive https://github.com/user-attachments/assets/34a733a4-45a3-409e-8a6a-b2a8c7540898 ranged mimics now use viscontents (they also keep trying to pointblank people for some reason i think thats ok though unless its a wand of fireball) ranged mimic (any ranged weapon animated by a bolt of animation) https://github.com/user-attachments/assets/c3f1d2f5-cfb8-46a9-a58c-255c53a034db ## Why It's Good For The Game fixes tgstation#85668 ## Changelog :cl: refactor: mimics (bolt of animation, malf ai Machine Override, etc) are basicmobs fix: crate mimics may now be opened /:cl: --------- Co-authored-by: Jacquerel <[email protected]>
…, also adds missing uplinks to customization (tgstation#89047) ## About The Pull Request Must have missed this in initial tests. Cancelling the stray syndicate cargo pod event while modifying the telecrystal value or uplink type did not cancel it. Now it does. Bonus - Uplinks that have been introduced since customization was added have been added ## Why It's Good For The Game I may have accidently dropped a syndicate cargo pod on a station today and I'd prefer to do it intentionally. ## Changelog :cl: fix: Admin fired stray syndicate cargo pods will not rebel against admin whims and launch themselves when cancelled. admin: Admins have new categories to fill syndicate cargo pods with. /:cl:
## About The Pull Request Fixes a runtime when the HFR moderator overflows. This should also let the HFR continue leaking its moderator contents after a crack is created. I didn't test this but it's quite simple really. ## Why It's Good For The Game Closes tgstation#70617 ## Changelog :cl: fix: Fixes HFR moderator leaking not leaking properly when a part is cracked. /:cl:
This comment was marked as resolved.
This comment was marked as resolved.
github-actions
bot
added
🖌️ Спрайты
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
|
This PR causes following conflicts on translate branch: code/modules/antagonists/heretic/magic/furious_steel.dm++<<<<<<< HEAD
+ desc = "Summon three silver blades which orbit you. \
+ While orbiting you, these blades will protect you from attacks, but will be consumed on use. \
+ Additionally, you can click to fire the blades at a target, dealing damage and causing bleeding."
++||||||| 2715a30ac71
++ desc = "Summon three silver blades which orbit you. \
++ While orbiting you, these blades will protect you from from attacks, but will be consumed on use. \
++ Additionally, you can click to fire the blades at a target, dealing damage and causing bleeding."
++=======
+ desc = "Вызовите три серебряных клинка, которые вращаются вокруг вас. \
+ Во время вращения, эти лезвия защищают вас от атак, но при использовании расходуются. \
+ Кроме того, вы можете использовать кнопку, чтобы выстрелить лезвиями в цель, нанося урон и вызывая кровотечение."
++>>>>>>> origin/translate
code/modules/surgery/coronary_bypass.dm++<<<<<<< HEAD
+/datum/surgery/coronary_bypass/mechanic
+ name = "Engine Diagnostic"
++||||||| 2715a30ac71
++/datum/surgery/gastrectomy/mechanic
++ name = "Engine Diagnostic"
++=======
+ /datum/surgery/gastrectomy/mechanic
+ name = "Диагностика двигателя"
++>>>>>>> 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.
This pull request merges upstream/master. Resolve possible conflicts manually and make sure all the changes are applied correctly.
Changelog
🆑 tgstation
add: Яйца (и вся другая съедобная еда), оставленные в горячем месте, будут жариться.
qol: Странные гейзеры теперь указывают в названии, что они производят.
qol: Мелкие и крошечные мобы больше не вызывают скрипа объектов, проходя по ним.
image: Перерисованы стандартные и миражные гранаты.
image: Фляга с нечистой водой стала темнее.
refactor: Провода и сборки были переработаны, чтобы добавить им направленность. Теперь сборки могут подключаться только к тем проводам, к которым это логически уместно.
qol: Напольные панели теперь могут принимать воспламенители, конденсаторы, вспышки, корпуса сборок и контроллеры дверей.
add: Подплиточные корпуса схем. Они работают, только если находятся под напольной плиткой, поддерживают USB-кабели и используют энергию АПЦ вместо батарей.
add: Настенные корпуса схем. Большие корпуса, поддерживающие USB-кабели и использующие энергию АПЦ вместо батарей.
add: Компонент "пучок проводов". Добавляет количество проводов в схему пропорционально емкости корпуса, что позволяет использовать сборки в логике схем.
fix: Исправлена диагностика двигателя при выполнении операции.
refactor: Мимики (стрела анимации, машинное подавление взломанного ИИ и т.п.) теперь относятся к basicmobs.
fix: Мимики в форме ящиков теперь можно открывать.
fix: Случайно запущенные администраторами грузовые капсулы Синдиката больше не "бунтуют" против административных команд и не запускаются, если их отменили.
admin: Администраторам добавлены новые категории для наполнения капсул Синдиката.
fix: Исправлена неправильная утечка модератора HFR при трещинах деталей.
/:cl:
Summary by Sourcery
Fry food by leaving it in hot places. Determine the contents of strange geysers from their name. Prevent small mobs from triggering squeaking objects. Update the sprites for standard and mirage grenades, and darken the unholy water flask. Refactor wires and assemblies to add directionality. Allow pressure plates to accept more devices. Add undertile and wall-mounted circuit shells, and introduce a wire bundle component for circuit logic. Fix engine diagnostic surgery, make mimics basic mobs, and allow crate mimics to be opened. Prevent admin-fired syndicate cargo pods from rebelling against admin commands. Add new categories for admins to fill syndicate cargo pods. Fix HFR moderator leaking improperly when a part is cracked.
New Features:
Tests: