[TM] Port fixes/content wave from pve #1218/#1269/#1272 + HALO #122#82
Merged
PhantornRU merged 77 commits intoMar 29, 2026
Merged
Conversation
SHARP tweaks, darts glow when in ground, handfuls can be taken from mags, track proc moved to UI button, cocking returns. Dart-mine timer upped, tripwire adjustments to be more consistent, B18 sprite update, giga-GL armor esque, helmet uses pyro one to simulate the rebreather it mentions desc-wise. Now has 2 use emergency injector plate baked in instead of useless tricord autoinjector dispenser
Troop commander & sergeant get command comms to confer between one another better
Nav-Inf stripy top made black & white instead of blue & white
# Conflicts: # code/datums/ammo/shrapnel.dm
# Conflicts: # code/game/objects/items/explosives/mine.dm
Fixes M6D Unloaded <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> # About the pull request <!-- Remove this text and explain what the purpose of your PR is. Mention if you have tested your changes. If you changed a map, make sure you used the mapmerge tool. If this is an Issue Correction, you can type "Fixes Issue #169420" to link the PR to the corresponding Issue number #169420. Remember: something that is self-evident to you might not be to others. Explain your rationale fully, even if you feel it goes without saying. --> # Explain why it's good for the game <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding, and may discourage maintainers from reviewing or merging your PR. This section is not strictly required for (non-controversial) fix PRs or backend PRs. --> # Testing Photographs and Procedure <!-- Include any screenshots/videos/debugging steps of the modified code functioning successfully, ideally including edge cases. --> <!-- !! If you are modifying sprites, you **must** include one or more in-game screenshots or videos of the new sprites. !! --> <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly label your changes in the changelog. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> <!-- If you add a name after the ':cl', that name will be used in the changelog. You must add your CKEY after the CL if your GitHub name doesn't match. Maintainers freely reserve the right to remove and add tags should they deem it appropriate. --> :cl: add: Added something admin: messed with admin stuff balance: rebalanced something code: changed some code config: changed some config setting del: Removed old things fix: fixed a few things imageadd: added some icons and images imagedel: deleted some icons and images imagetweak: tweaked some icons and images mapadd: added a new map or section to a map maptweak: tweaked a map qol: made something easier to use refactor: refactored some code server: something server ops should know soundadd: added a new sound thingy sounddel: removed an old sound thingy soundtweak: tweaked a sound thingy spellcheck: fixed a few typos ui: changed something relating to user interfaces /:cl: <!-- Both :cl:'s are required for the changelog to work! -->
|
You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard. |
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request introduces a comprehensive overhaul and expansion of the landmine system, featuring new mine types with skill-dependent disarming mechanics, specialized shrapnel, and updated SHARP dart behavior. Additionally, it adds new USASF job roles, 'Snowman' gear presets for CANC rebels, and visual 'Flyby' options to the Fire Support menu. Other notable changes include vehicle damage multiplier adjustments, bomb suit stat buffs, and various gear preset refinements. A duplicate definition for the active PMC claymore was found in the mine implementation and should be addressed.
(cherry picked from commit 66c84edfea2865e6b9ec72879f75ee310c0eb796)
Author
|
!gemini review |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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
Этот PR портирует в
SS220/BandaTroopersволну фиксов и контента из:cmss13-pve#1218cmss13-pve#1269cmss13-pve#1272cmss13-pve-halo#122Дополнительно в порт включены follow-up фиксы из
cmss13-pve-halo#124иcmss13-pve-halo#125, а также несколькоBandaTroopers-only compatibility/fixup commits поверх волны.Откуда портировано
cmss13-devs/cmss13-pve#1218: [DNM] [TM ONLY] Various fixes & tweaks cmss13-devs/cmss13-pve#1218cmss13-devs/cmss13-pve#1269: [TM Only] Snowman cmss13-devs/cmss13-pve#1269cmss13-devs/cmss13-pve#1272: [TM ONLY] Koishi's landmines and Rob606s proximity sensor and mine.dm from pandoras fixes [REQUIRES PANDORAS FIXES TO WORK] cmss13-devs/cmss13-pve#1272cmss13-devs/cmss13-pve-halo#122: Fixes M6D Unloaded cmss13-devs/cmss13-pve-halo#122cmss13-devs/cmss13-pve-halo#124: fix pods cmss13-devs/cmss13-pve-halo#124cmss13-devs/cmss13-pve-halo#125: Throat slitting fix cmss13-devs/cmss13-pve-halo#125Локальные BT follow-up'ы
b60af93357Fix GM AI click-spawn species persistencee91625f3baReset player survival rules for new rounds68ca3189b0Address review and lint follow-upsf6c46609c6Improve corpsman skill ladders and cover self-splint regression1fe80f78e5Annotate BT-only code diffs with SS220 EDIT markersДополнительные портированные follow-up'ы
1be0578d85<-dec2c96ea34c157f05a053fc7947c91cae6a1edbfix podsa79949ed29<-66c84edfea2865e6b9ec72879f75ee310c0eb796fixie fixieMerge / compatibility notes
fire_support_menu, belt/HUD DMI,grenade.dmi, SHARP/mine путей и supply-секций.#1272были адаптированы под локальную структуру файлов и историю контентаBandaTroopers, при сохранении исходного поведения.Player Survivalвыполняется на переходе в pregame lobby нового раунда, чтобы чистить stale state предыдущего раунда, но не затирать изменения, сделанные в текущем lobby.corpsman/medicпересобрана: базовыеUSCM/UNSC/Forecon/USASF/ONIcorpsman-ветки теперь идут наMedical = DoctorиSurgery = Trained, аODST,Marine Raiders,PMC,contractorиmercenarymedics подняты доMedical = MasterиSurgery = Expert.SPLINTне подтвердил глобальную поломку self-use: self-splint ноги и противоположной руки работает штатно, а попытка шинировать ту же руку, в которой держится splint, по-прежнему блокируется дизайном. Это закреплено regression unit tests.code/**дополнительно размеченыSS220 EDITпоSS220_DEVELOPMENT_RULES.md, чтобы сопровождаемый апстрим-дифф по этому PR оставался читаемым и формально консистентным.Проверка
bash tools/ci/check_filedirs.sh colonialmarines.dmegit diff --cached --checkgit diff --checktools/build/build --ci dm -DCIBUILDING -DANSICOLORS -Werrorbash tools/ci/run_server.sh almayerлокально запускался, но не дал диагностического вывода до ручной остановки; на итоговые кодовые проверки не опирался.Changelog
🆑
fix: Портированы фиксы SHARP/spec-экипировки,
RMC CMD headset,IV drip,M6D unloaded, корректный HALO drop pod landing и throat slit для не-human species с human-type body.add: Портирована content/fix wave из
cmss13-pve#1269/#1272, включая mine/ammo/supply/gear additions и связанные integration changes.admin: Исправлен GM AI click-spawn species persistence для synthetics, unggoy и sangheili.
balance: Корпсманы
USCM/UNSC/Foreconи связанные ship/security варианты получили повышенные уровниMedical/Surgery; элитные медикиODST,Marine Raiders,PMC,contractorиmercenaryподняты ещё выше.code: Починен стартовый reset
Player Survivaldefaults, поэтомуSave Before DeathиAnti-Gib Fallbackработают с начала раунда без ручногоReset to defaults.code: Добавлена regression coverage для
SPLINT: подтверждены рабочие сценарии self-splint для ноги и свободной руки, а ограничение на active-hand arm закреплено тестами.ui: Обновлены связанные GM fire-support / content integration поверхности волны.
imageadd: Портированы новые HUD, undershirt и item assets из upstream-волны.
/:cl: