HALO PVE Update: Batch 1-3B (final wave: all CM-PVE + CM-PVE-HALO PRs ported)#102
Merged
PhantornRU merged 64 commits intoJun 18, 2026
Merged
Conversation
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 44a127c767
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
PhantornRU
added a commit
to PhantornRU/BandaTroopersFork
that referenced
this pull request
Jun 4, 2026
…modular paths, document areas.dmi tech debt
PhantornRU
force-pushed
the
halo-pve-update-batch1-3b
branch
from
d7e2e7e to
6343604
Compare
PhantornRU
commented
Jun 6, 2026
…#120 Halo Firesupport, cmss13-devs#129 Faction splitting
…enant carbine scope)
PhantornRU
force-pushed
the
halo-pve-update-batch1-3b
branch
from
324dbad to
d562d58
Compare
PhantornRU
force-pushed
the
halo-pve-update-batch1-3b
branch
from
35a3726 to
ec0b0ed
Compare
…s#1284: TWE warcry sounds, new maps (arctic_valley, chapaev_movie, golden_arrow, jungle_delta, prospector_canyon, UPP/USCM bunkers), TWE tank vehicles, spider xenos, VAI undersuit, dog_war MRE, various fixes and improvements
…s#1284: TWE warcry sounds, new maps (arctic_valley, chapaev_movie, golden_arrow, jungle_delta, prospector_canyon, UPP/USCM bunkers), TWE tank vehicles, spider xenos, VAI undersuit, dog_war MRE, various fixes and improvements
…rnRU/BandaTroopersFork into halo-pve-update-batch1-3b
Author
Review Fixes Applied (commit 5f1e274)All 6 issues from PR #102 review have been resolved:
Verification:
|
…n-budget.md, SKILL.md)
Исправлено 9 критических ошибок и 13 предупреждений:`n`n- Spider Guard/Hunter/Nurse: добавлен префикс 'Normal ' в icon_state`n- screen2_full.dmi, devices.dmi, lighting.dmi: исправлен delay count`n- VAI.dmi, hud.dmi: восстановлены из upstream (были 404)`n- cm_hats/suits/ties_overlay/uniforms: удалены ошибочные дубликаты в icons/mob/humans/onmob/`n- README.md: лицензия ассетов CC BY-SA -> CC BY-NC-SA`n- modular/halo/__docs/ATTRIBUTION.md: добавлен файл атрибуции`n- unsc_melee.dmi: удалена заглушка 'TO SATISFY CHECKS'`n`nCompile: 0 errors, 0 warnings
…arrow_movie Удалён префикс '+' из всех строк в git-объектах карт chapaev_movie.dmm и golden_arrow_movie.dmm, которые были повреждены при создании коммита 7edb6da.
cmss13-devs#159 из CM-PVE-HALO Модуль: modular/halo`n`nPR cmss13-devs#185 — Specialist Stuff is indestructible`nPR cmss13-devs#186 — UNSC headsets default tracks`nPR cmss13-devs#183 — UNSC & ODST Flags/Banners`nPR cmss13-devs#159 — Shotgun & sniper ammo boxes
…evs#185, cmss13-devs#186, cmss13-devs#183, cmss13-devs#159 Модуль: modular/halo`n`n- Добавлены PR cmss13-devs#183 (UNSC & ODST Flags/Banners), cmss13-devs#185 (Specialist Stuff is indestructible), cmss13-devs#186 (UNSC headsets default tracks) в таблицу Ported PRs`n- PR cmss13-devs#159 обновлён с пометкой re-ported`n- Summary обновлён: PORTED 18→21, Total 22→25`n- Указан коммит 10b1519 и дата 2026-06-12
Restore canister grenade parity, GM infest embryo selection, featureless and movie map metadata, and HALO hygiene cleanup. Remove leftover root HALO sounds and unused aggregate HALO gun files; update CM-PVE/HALO port docs.
Keep AI grenade throws from being interrupted, add safer throw-back handling, and clean Golden Arrow briefing DMM diff-marker prefixes.
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
1 participant
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.
Summary
Comprehensive upstream sync from CM-PVE (https://github.com/cmss13-devs/cmss13-pve) and CM-PVE-HALO (https://github.com/cmss13-devs/cmss13-pve-halo) into BandaTroopers.
48/48 must-port PRs — all ported, compiled, validated, and review-fixes applied.
CM-PVE-HALO (https://github.com/cmss13-devs/cmss13-pve-halo)
/obj/vehicle/souto/mongoosesubtypeSummary: 25 PORTED + 2 ALREADY PRESENT = 27 total
CM-PVE (https://github.com/cmss13-devs/cmss13-pve)
code/__DEFINES/mode.dm,code/modules/mob/dead/observer/orbit.dm,tgui/packages/tgui/interfaces/Orbit/index.tsx,tgui/packages/tgui/interfaces/Orbit/types.tscode/datums/ammo/misc.dm,code/modules/admin/topic/topic.dm:1219-1248,code/modules/projectiles/guns/specialist/launcher/rocket_launcher.dmcode/game/objects/items.dm:853-862,code/modules/clothing/head/helmet.dm:1113-1477,code/modules/clothing/masks/gasmask.dm:24-249code/global.dm,map_config/shipmaps.txtuscm_bunker,upp_bunker, access templates, JSON configscode/__DEFINES/access.dm,code/__DEFINES/job.dm,code/__DEFINES/mode.dm,code/datums/skills/civilian.dm,code/datums/skills/upp.dm,code/game/jobs/job/civilians/other/liaison.dm,code/game/jobs/job/marine/squads.dm,code/modules/clothing/suits/marine_coat.dm,code/modules/gear_presets/uscm_ship.dmchapaev_movie,golden_arrow_movie. New roles: UPP Liaison, Civilian Advisor, MSS Agentcode/game/sound.dm:595-612,code/modules/mob/living/carbon/human/emote.dm:382-394code/_globalvars/misc.dm,code/datums/ammo/bullet/special_ammo.dm,code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm,code/game/objects/items/explosives/grenades/marines.dm,code/game/objects/items/reagent_containers/food/mre_food/dog_war.dm,code/game/objects/items/storage/backpack.dm,code/game/objects/items/storage/mre.dm,code/modules/client/preferences.dm,code/modules/clothing/head/helmet.dm,code/modules/clothing/shoes/marine_shoes.dm,code/modules/clothing/suits/marine_armor/_marine_armor.dm,code/modules/clothing/under/marine_uniform.dm,code/modules/clothing/under/ties.dm,code/modules/cm_marines/dropship_equipment.dm,code/modules/cm_marines/smartgun_mount.dm,code/modules/projectiles/ammo_boxes/grenade_boxes.dm,code/modules/projectiles/ammo_boxes/magazine_boxes.dm,code/modules/projectiles/ammo_boxes/misc_boxes.dm,code/modules/projectiles/gun_attachables.dm,code/modules/projectiles/guns/misc.dm,code/modules/projectiles/guns/rifles.dm,code/modules/projectiles/magazines/misc.dm,code/modules/projectiles/magazines/rifles.dm,colonialmarines.dmegolden_arrow_dog_war, dropship typhoon changes, new vendors/attachmentscode/datums/emergency_calls/souto.dmcode/__DEFINES/xeno.dm:247-248,332,code/modules/mob/living/carbon/xenomorph/castes/Drone.dm,code/modules/mob/living/carbon/xenomorph/castes/Runner.dm,code/modules/mob/living/carbon/xenomorph/castes/Soldier.dm,code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm,code/modules/mob/living/carbon/xenomorph/castes/Crusher.dmcode/datums/vehicles.dm:133-145,code/modules/vehicles/twe_tank/twe_apc.dm,code/modules/vehicles/twe_tank/twe_tank.dm,code/modules/vehicles/hardpoints/hardpoint_ammo/heavy_autocannon.dmcode/modules/clothing/under/vai.dm:1-49,code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm,colonialmarines.dmecode/__DEFINES/xeno.dm:110,229,325,718-719,727,code/__DEFINES/mobs.dm,code/__DEFINES/typecheck/xenos.dm,code/game/jobs/role_authority.dm,code/game/machinery/medical_pod/autodoc.dm,code/modules/admin/game_master/game_master.dm,code/modules/admin/game_master/game_master_submenu/infest.dm,code/modules/admin/player_panel/actions/transform.dm,code/modules/mob/living/carbon/human/ai/brain/ai_brain_items.dm,code/modules/mob/living/carbon/xenomorph/Embryo.dm,modular/xeno_races/code/bodyburster.dm,modular/xeno_races/code/lanky.dm,modular/xeno_races/_xeno_races.dmcode/game/objects/items/explosives/mine.dm:373-382,393-918,code/__DEFINES/guns.dm,code/datums/ammo/shrapnel.dm,code/game/objects/items/storage/boxes.dm,code/game/objects/structures/crates_lockers/largecrate_supplies.dm,code/modules/assembly/proximity.dm,code/modules/clothing/suits/utility.dm,code/modules/mob/living/carbon/human/ai/defense_creator.dmcode/__DEFINES/xeno.dm,code/__DEFINES/typecheck/xenos.dm,code/game/jobs/role_authority.dm,code/game/sound.dm,code/modules/admin/game_master/game_master.dm,code/modules/admin/game_master/game_master_submenu/ambush.dm,code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm,code/modules/mob/living/carbon/xenomorph/abilities/general_ability_macros.dm,code/modules/mob/living/carbon/xenomorph/ai/movement/spider.dm,code/modules/mob/living/carbon/xenomorph/castes/Spider_Guard.dm,code/modules/mob/living/carbon/xenomorph/castes/Spider_Hunter.dm,code/modules/mob/living/carbon/xenomorph/castes/Spider_Nurse.dm,code/modules/mob/living/carbon/xenomorph/castes/Giant_Lizard.dm,code/modules/mob/living/carbon/xenomorph/death.dm,code/modules/mob/living/carbon/xenomorph/emote.dm,colonialmarines.dmecode/__DEFINES/__game.dm:58-62,code/modules/cm_marines/equipment/maps.dm,map_config/maps.txtcode/modules/clothing/head/helmet.dm:2381,code/modules/clothing/suits/marine_armor/_marine_armor.dm,code/modules/gear_presets/canc.dm,code/modules/mob/living/carbon/human/ai/action_datums/mg_nest.dm,code/modules/mob/living/carbon/human/ai/action_datums/sniper_nest.dm,code/modules/mob/living/carbon/human/ai/ai_spawner/ai_presets_canc.dmcode/modules/assembly/proximity.dm:43-49,code/modules/mob/living/carbon/human/ai/defense_creator.dmcode/datums/vehicles.dm:33-35,code/modules/vehicles/apc/apc_wolfpack.dm,code/modules/vehicles/hardpoints/holder/tank_turret.dm,code/modules/vehicles/hardpoints/primary/ltb.dm,colonialmarines.dmecode/datums/vehicles.dm:65-67,code/modules/vehicles/ridgewaytank/ridgewaytank.dm,code/modules/vehicles/ridgewaytank/interior.dm,code/modules/vehicles/hardpoints/hardpoint_ammo/ridgewaycannon_ammo.dm,code/modules/vehicles/hardpoints/hardpoint_ammo/plasma_cannon.dm,code/modules/vehicles/hardpoints/primary/ridgeway_cannon.dm,code/modules/vehicles/hardpoints/primary/plasma_cannon.dm,code/datums/ammo/rocket.dm,code/modules/projectiles/magazines/specialist.dm,colonialmarines.dmecode/modules/gear_presets/synths.dm,code/modules/mob/living/carbon/human/life/handle_pulse.dm,code/modules/mob/living/carbon/human/powers/human_powers.dm,code/modules/mob/living/carbon/human/species/synthetic.dmcode/game/area/areas.dm,code/modules/admin/admin_verbs.dm,code/modules/admin/game_master/extra_buttons/light_change.dm,code/modules/admin/game_master/extra_buttons/shipmap_light_change.dm,colonialmarines.dmecode/game/objects/items/devices/taperecorder.dmcode/modules/gear_presets/canc.dm,code/modules/mob/living/carbon/human/ai/ai_spawner/ai_presets_canc.dm,code/modules/mob/living/carbon/human/ai/squad_spawner/squad_clf.dmremnant/officer,machinegunner/heappresets; paygrade fixes; new CANC squad presetscode/modules/admin/admin_verbs.dm,code/modules/admin/game_master/extra_buttons/chapter_title.dm,code/modules/admin/game_master/extra_buttons/send_tip.dm,icons/mob/hud/screen2_full.dmi,colonialmarines.dmecode/game/objects/effects/overlays.dm,code/modules/admin/game_master/extra_buttons/fire_support_menu.dm,tgui/packages/tgui/interfaces/GameMasterFireSupportMenu.jsxcode/modules/clothing/head/helmet.dm,code/modules/clothing/suits/marine_armor/ert.dm,code/modules/clothing/under/marine_uniform.dm,code/modules/clothing/under/ties.dmNO_SNOW_TYPE/NO_NAME_OVERRIDEflags for UPP/CANC clothing; DMI sprites (TM ONLY)map_config/shipmaps.txt,maps/rover_tethered.json,maps/map_files/rover_tethered/rover_tethered.dmmSummary: 26 PORTED + 1 ALREADY PRESENT = 27 total
Summary
BUILD.cmd— 0 errors, 0 warningscode/files properly marked with START/END blocks.dmiicons + 9.oggsounds downloaded from upstream.ogg→modular/halo/sound/(original) + 42 additional.oggmigrated in review pass = 218 totalIntentional Deviations
The following upstream PRs were intentionally not ported or partially ported:
Branch Commit History
44a127c70f6a6d223d16423616b5521c50d8037d3e2052f2f06801731852fcb63436045f1e274Validation
BUILD.cmd— 0 errors, 0 warnings.oggfiles inmodular/halo/sound/⭐ Newly Ported PRs from CM-PVE-HALO (Batch 1-3B extension)