Merge Upstream 12.09.2024 #1500
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
* this is hell pain * fixes merge issues when cutting up various items * adds early return to attackby
* add option to disable end of round sound * fix sleep position * add EOR sound to enable/disable preferences * invert logic so that existing players don't mute the sound * fix inconsistent mute/hear variable --------- Co-authored-by: pwbokie <[email protected]>
* E * forgor this * forgor this thing too * add icons * Update work_tools.dm Signed-off-by: MLGTASTICa <[email protected]> * Update code/modules/research/designs/mechfabricator_designs.dm Co-authored-by: 1080pCat <[email protected]> Signed-off-by: MLGTASTICa <[email protected]> * Update code/game/mecha/equipment/tools/work_tools.dm Co-authored-by: 1080pCat <[email protected]> Signed-off-by: MLGTASTICa <[email protected]> * my beloved , gone. * misinput!!! * Update code/game/mecha/equipment/tools/work_tools.dm Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: MLGTASTICa <[email protected]> * Review compliance * Update work_tools.dm * Update work_tools.dm * more fixes * Update work_tools.dm --------- Signed-off-by: MLGTASTICa <[email protected]> Co-authored-by: 1080pCat <[email protected]> Co-authored-by: warriorstar-orion <[email protected]>
…adiseSS13#26603) * [FIX] Red engineering ERT suits have their species sprites back * woops sorry AA.
* Deletes old Gas Meter sprites Bye bye! * Resprites Gas Meter - edit of SmArtKar's TG version - Credit to SmArtKar for original TG sprite.
ParadiseSS13#26707) * Copies the requirements from handcuff code * This proc is never implemented * Removes unused procs
github-actions
bot
added
🖌️ Спрайты
dj-34
approved these changes
Sep 12, 2024
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.
Даже кокфликта не было, кайф
Changelog
🆑 ParadiseSS13
add: Добавлена возможность отключить звук в конце раунда.
tweak: Вторичные цели теперь гораздо, гораздо менее склонны к тому, чтобы давать вам несколько целей «X из Y разных вещей» одна за другой.
fix: Пофикшена проблема из-за которой у Крашера на мехе не было КД атаки.
fix: Крашер на мехе теперь может бить не только мобов.
fix: Наручники культяпок теперь надеваются на людей без руки.
imageadd: Fantik специально для оффпары нарисовал новые спрайты для патчей, можете погладить крысу.
imageadd: Новые спрайты для Gas Meter.
/:cl: