Skip to content

Conversation

@Git-Nivrak
Copy link
Contributor

@Git-Nivrak Git-Nivrak commented Sep 13, 2025

About the pull request

Changes up squads to have designated roles and purposes which also affect their role composition and size.

The three "types" of squads are as follows:

Assault (>=50% of squad marines):
Alpha and Delta, these will be the squads as you've known until today and will not be limited, for people looking to just play without extra responsibility. The only difference is that they will have two smartgunners now instead of one.

Support (<=30% of squad marines):
Charlie, Kilo and Oscar, these squads will serve as filling the niche for players looking for small, coordinated squad gameplay and serve as an unknown variable up to command's discretion. They have no smartgunner or team leader.

Security (<= 20 of squad marines):
Bravo, tasked with, you guessed it - FOB Security, This includes FOB, Comms and possibly other duties down the line with logistics changes. The specialist and smartgunner are removed from bravo.

IMG_5456

Explain why it's good for the game

ASS system introduces an asymmetrical squad structure that allows players to head into rounds under the pretense that they will be able to engage in a specific type of CM experience, while leaning into squad archetypes and giving more flexibility to command roles.

The Assault squads represent the classic, large group CM gameplay experience, where individual player agency is at a maximum and cohesion is a function of herd behavior.

Support squads introduce a more refined, guided experience where 3 small squads function at the behest of command (similar to a PvE style experience, and officers are giving more tactile control over a subset of players on the ground.

Security is the traditional slower-paced backline and defense group, streamlined to only contain roles relevant, while issuing specialist and smartgunner roles to other squads.

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
refactor: All headsets are now self setting.
add: Kilo and Oscar squads.
balance: Increase SG slots on Alpha and Delta to 2, Reduced SG slots on rest of the squads to 0, Reduced specialist slots on Bravo to 0, Reduced FTL slots on Charlie, Oscar and Kilo to 0.
balance: Riflemen slots on Kilo, Oscar and Charlie will be limited to 10% of total squad marines each, 20% on Bravo
maptweak: Changed up squad preps into platoon preps, Platoon 1 is Alpha And Delta, Platoon 2 is Charlie, Oscar, Kilo and Bravo. Credit to thwomper.
/:cl:

@cmss13-ci cmss13-ci bot added Sprites Remove the soul from the game. Mapping did you remember to save in tgm format? Refactor Make the code harder to read Feature Feature coder badge Balance You need to be a professional veteran game maintainer to comprehend what is being done here. size/L Denotes a PR that changes 200-799 lines, ignoring generated files. labels Sep 13, 2025
b3bffaa: maps/map_files/USS_Almayer/USS_Almayer.dmm

Automatically commited by: tools\mapmerge2\fixup.py
@cm13-github
Copy link
Contributor

cm13-github commented Sep 13, 2025

Test merge deployment history:

Test Merge Deployed @ 09/13/2025 16:24:40 +00:00:
Server Instance

CM13 Live

Revision

Origin: 198bf1e
Pull Request: 71541af
Server: 334659b

Test Merge Updated @ 09/13/2025 17:44:20 +00:00:
Server Instance

CM13 Live

Revision

Origin: 3f0175f
Pull Request: 71541af
Server: 9f0c4ea8703f91a6301b8845f0fa3905ffaffdc4

Test Merge Updated @ 09/13/2025 18:18:54 +00:00:
Server Instance

CM13 Live

Revision

Origin: 3f0175f
Pull Request: f9b36fc
Server: 7c86f10

Test Merge Removed @ 09/13/2025 18:27:38 +00:00:
Server Instance

CM13 Live

Test Merge Deployed @ 09/14/2025 18:22:34 +00:00:
Server Instance

CM13 Live

Revision

Origin: 91e5e38
Pull Request: 6071b9e
Server: 9bc753c

Test Merge Removed @ 09/14/2025 19:06:18 +00:00:
Server Instance

CM13 Live

Test Merge Deployed @ 09/15/2025 15:40:50 +00:00:
Server Instance

CM13 Live

Revision

Origin: f9a29c2
Pull Request: 7d23458
Server: 288a894

Test Merge Updated @ 09/15/2025 16:00:18 +00:00:
Server Instance

CM13 Live

Revision

Origin: f9a29c2
Pull Request: 9261fe5
Server: b960b63

Test Merge Removed @ 09/15/2025 18:06:26 +00:00:
Server Instance

CM13 Live

Test Merge Deployed @ 09/16/2025 06:32:18 +00:00:
Server Instance

CM13 Live

Revision

Origin: 51f3ede
Pull Request: 46ef057
Server: c8f52cc

Test Merge Removed @ 09/16/2025 07:15:02 +00:00:
Server Instance

CM13 Live

Test Merge Deployed @ 09/18/2025 09:40:18 +00:00:
Server Instance

CM13 Live

Revision

Origin: debcf34
Pull Request: 90380a9
Server: 1fe9c92

Test Merge Updated @ 09/18/2025 15:59:31 +00:00:
Server Instance

CM13 Live

Revision

Origin: debcf34
Pull Request: e0e2658
Server: 85cd11c

Test Merge Updated @ 09/18/2025 16:55:32 +00:00:
Server Instance

CM13 Live

Revision

Origin: debcf34
Pull Request: 77dc784
Server: d0dffdb

Test Merge Updated @ 09/19/2025 01:55:15 +00:00:
Server Instance

CM13 Live

Revision

Origin: 7007712
Pull Request: 77dc784
Server: ef081e1eeb160e0d248732ee8581414eecc13390

Test Merge Updated @ 09/20/2025 06:56:04 +00:00:
Server Instance

CM13 Live

Revision

Origin: 7007712
Pull Request: 5af7a89
Server: 06143ab

Test Merge Updated @ 09/20/2025 08:25:28 +00:00:
Server Instance

CM13 Live

Revision

Origin: 7007712
Pull Request: b41c241
Server: 83d9833

Test Merge Updated @ 09/20/2025 16:04:35 +00:00:
Server Instance

CM13 Live

Revision

Origin: f136622
Pull Request: b41c241
Server: f8a2fee71c65b8343ee8b2e0960f4436a1552209

Test Merge Updated @ 09/20/2025 16:35:26 +00:00:
Server Instance

CM13 Live

Revision

Origin: 7318e0b
Pull Request: b41c241
Server: 19e628db3387b9195f016cd854e4a54be10014a3

Test Merge Updated @ 09/20/2025 17:06:16 +00:00:
Server Instance

CM13 Live

Revision

Origin: 652f8ed
Pull Request: b41c241
Server: b1cb327

Test Merge Updated @ 09/20/2025 17:37:06 +00:00:
Server Instance

CM13 Live

Revision

Origin: 8279ac4
Pull Request: b41c241
Server: 901df430186314f0626d22d3734de9caad16e636

Test Merge Removed @ 09/20/2025 17:52:08 +00:00:
Server Instance

CM13 Live

Test Merge Deployed @ 12/02/2025 19:26:40 +00:00:
Server Instance

CM13 Live

Revision

Origin: 46f8e9a
Pull Request: 6dd9a26
Server: 1301ba4

Test Merge Removed @ 12/02/2025 20:26:34 +00:00:
Server Instance

CM13 Live

Test Merge Deployed @ 12/08/2025 16:58:31 +00:00:
Server Instance

CM13 Live

Revision

Origin: 854fb18
Pull Request: d1b660e
Server: 79e8db0

Test Merge Removed @ 12/08/2025 18:01:25 +00:00:
Server Instance

CM13 Live

Test Merge Deployed @ 12/18/2025 17:05:39 +00:00:
Server Instance

CM13 Live

Revision

Origin: abeedd8
Pull Request: 24bce99
Server: 4871e38

Test Merge Updated @ 12/18/2025 18:09:46 +00:00:
Server Instance

CM13 Live

Revision

Origin: abeedd8
Pull Request: 3b50d1e
Server: fadce0e

Test Merge Removed @ 12/18/2025 23:44:09 +00:00:
Server Instance

CM13 Live

Test Merge Deployed @ 12/21/2025 04:36:05 +00:00:
Server Instance

CM13 Live

Revision

Origin: 35c0ab8
Pull Request: 3b50d1e
Server: 0f955e8

Test Merge Removed @ 12/21/2025 08:03:01 +00:00:
Server Instance

CM13 Live

Test Merge Deployed @ 12/21/2025 09:00:03 +00:00:
Server Instance

CM13 Live

Revision

Origin: 35c0ab8
Pull Request: 3b50d1e
Server: 0f955e8

Test Merge Updated @ 12/22/2025 01:52:37 +00:00:
Server Instance

CM13 Live

Revision

Origin: 35c0ab8
Pull Request: 3b50d1e
Server: 2424d2c

Test Merge Updated @ 12/22/2025 05:12:34 +00:00:
Server Instance

CM13 Live

Revision

Origin: 35c0ab8
Pull Request: 3b50d1e
Server: 0f955e8

Test Merge Removed @ 12/22/2025 07:22:11 +00:00:
Server Instance

CM13 Live

Test Merge Deployed @ 12/22/2025 08:08:11 +00:00:
Server Instance

CM13 Live

Revision

Origin: 35c0ab8
Pull Request: 3b50d1e
Server: 0f955e8

Test Merge Updated @ 12/22/2025 16:38:27 +00:00:
Server Instance

CM13 Live

Revision

Origin: 35c0ab8
Pull Request: 2fc8da2
Server: f3d48ef

Test Merge Updated @ 12/22/2025 17:06:52 +00:00:
Server Instance

CM13 Live

Revision

Origin: 35c0ab8
Pull Request: 9dc240f
Server: e65b0a5

Test Merge Updated @ 12/22/2025 18:54:39 +00:00:
Server Instance

CM13 Live

Revision

Origin: 35c0ab8
Pull Request: 9dc240f
Server: 18d8c90

Test Merge Updated @ 12/22/2025 21:20:01 +00:00:
Server Instance

CM13 Live

Revision

Origin: 874e0f6
Pull Request: 9dc240f
Server: 9a3a829

Test Merge Updated @ 12/22/2025 21:25:40 +00:00:
Server Instance

CM13 Live

Revision

Origin: 5865e90
Pull Request: 9dc240f
Server: 482e634e4fc920f8dcba13ba85876cddee800410

Test Merge Updated @ 12/23/2025 02:27:16 +00:00:
Server Instance

CM13 Live

Revision

Origin: 28436b9
Pull Request: 9dc240f
Server: 7e3ffdcc660cc0c22b0608b4550b32a393c639c0

Test Merge Updated @ 12/23/2025 14:42:27 +00:00:
Server Instance

CM13 Live

Revision

Origin: 28436b9
Pull Request: 9dc240f
Server: 61a3cfc

Test Merge Updated @ 12/23/2025 17:37:27 +00:00:
Server Instance

CM13 Live

Revision

Origin: 28436b9
Pull Request: bf28809
Server: aa695cf

Test Merge Updated @ 12/23/2025 18:04:33 +00:00:
Server Instance

CM13 Live

Revision

Origin: 28436b9
Pull Request: bf28809
Server: 20379b8

Test Merge Updated @ 12/24/2025 05:02:34 +00:00:
Server Instance

CM13 Live

Revision

Origin: a7533f2
Pull Request: bf28809
Server: d77e612aefa8bc8a10c7e112edb069b7a5d984d3

Test Merge Updated @ 12/24/2025 07:03:42 +00:00:
Server Instance

CM13 Live

Revision

Origin: 9ed2eba
Pull Request: bf28809
Server: 386415e424f0ee17e7901240602a608fcfb18418

Test Merge Updated @ 12/24/2025 12:05:20 +00:00:
Server Instance

CM13 Live

Revision

Origin: aa27782
Pull Request: bf28809
Server: 333493d5cbb1804448112f05f1179da5c8dd0284

Test Merge Removed @ 12/24/2025 17:24:29 +00:00:
Server Instance

CM13 Live

Test Merge Deployed @ 12/24/2025 20:07:22 +00:00:
Server Instance

CM13 Live

Revision

Origin: aa27782
Pull Request: bf28809
Server: 2bb2c1c

Test Merge Updated @ 12/25/2025 02:09:05 +00:00:
Server Instance

CM13 Live

Revision

Origin: a3e29fa
Pull Request: bf28809
Server: a60927d

Test Merge Removed @ 12/25/2025 05:25:23 +00:00:
Server Instance

CM13 Live

Test Merge Deployed @ 12/25/2025 09:44:05 +00:00:
Server Instance

CM13 Live

Revision

Origin: a3e29fa
Pull Request: bf28809
Server: a60927d

Test Merge Updated @ 12/25/2025 20:53:03 +00:00:
Server Instance

CM13 Live

Revision

Origin: a3e29fa
Pull Request: edc6134
Server: b45a39c

Test Merge Updated @ 12/25/2025 22:39:06 +00:00:
Server Instance

CM13 Live

Revision

Origin: a3e29fa
Pull Request: c8ab61e
Server: c508d8d

Test Merge Updated @ 12/25/2025 22:41:22 +00:00:
Server Instance

CM13 Live

Revision

Origin: a3e29fa
Pull Request: 0702d8a
Server: e756cdb

Test Merge Updated @ 12/25/2025 22:48:59 +00:00:
Server Instance

CM13 Live

Revision

Origin: a3e29fa
Pull Request: dcede86
Server: 835dee7

Test Merge Removed @ 12/26/2025 02:48:13 +00:00:
Server Instance

CM13 Live

Test Merge Deployed @ 12/26/2025 09:09:47 +00:00:
Server Instance

CM13 Live

Revision

Origin: a3e29fa
Pull Request: dcede86
Server: 835dee7

Test Merge Updated @ 12/26/2025 12:20:22 +00:00:
Server Instance

CM13 Live

Revision

Origin: a3e29fa
Pull Request: 469f550
Server: a83e5bb

@sheepism
Copy link

Do not be fooled, this is a PVE plot to take over PVP. First PVE, then PVP will be lore accurate..

@cuberound

This comment was marked as resolved.

@Stinvals
Copy link

The Corporate Liaison's auto briefcase lacks the new comm keys (round 29894)
image

@SirNightKnight

This comment was marked as resolved.

@Stinvals
Copy link

The 2nd Platoon briefing has a W-Y pen placed in it instead of a regular one. A gross oversight
image

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Dec 2, 2025
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Dec 9, 2025
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Dec 18, 2025
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@BroseidonMOO BroseidonMOO added the Testmerge Candidate we'll test this while you're asleep and the server has 10 players label Dec 21, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Feature Feature coder badge Mapping did you remember to save in tgm format? Refactor Make the code harder to read size/XL Denotes a PR that changes 799-1999 lines, ignoring generated files. Sprites Remove the soul from the game. Testmerge Candidate we'll test this while you're asleep and the server has 10 players UI deletes nanoui/html

Projects

Status: Partially Approved / Mergeable

Development

Successfully merging this pull request may close these issues.