RMC revamp revived #912

BonniePandora · 2025-04-18T16:56:26Z

About the pull request

Revives #842 with tweaks made
I highly suggest checking the original PR's description to see what was changed initially & such

Changes I've personally made include;

Renames RMC job titles/roles for IDs
Tweaks to paygrades to include royal navy medic, army royal engineers combat engi and army royal artillery light gunner
Updated HUD icons for various RMC roles
Skill tweaks, fireman carry upped to same as USCM, police skill removed, CQC, melee & jtac upped or given to roles missing them. Medic gets surg 2 but no fancy tools besides their little pouch, engineer is on-par with CM engi in terms of engineering related skills
Medic backpack & new (but recoloured) uniform sprites ported from RMC update PR on PvP (Credits to Vandu-Jr & Zenith for those)
PMC sniper helmet revived & RMC subtype made, given to royal marine sniper
Lots of preset changes
NSG UGL changed to 3-shot one
NSG burstfire delay reduced
New 20mm MGL for the RMC
Wholesale RMC Troop (platoon) added
RMC VP78 & NSG changes made into subtypes, original non-RMC named versions retained as parent items.
New TWE origins added
New RMC DMR, the L64A3, sprites done by Dimdi on the discord, sounds are a mix of actual Type 64 gunfire & flanger effects by Mesnomer
New mission-start icon & functionality to account for the RMC troop
Kukri knife, TWE_ORIGINS locked in the loadout
New shipmap, the HMS Brynhild, done by Lakynet, and a currently unused shipmap done by SilensVigil (which will become a highpop RMC ship instead)
New dropship for the RMC, based off the one present on the ERT station

Explain why it's good for the game

Liked the way this was developing, shame to see it rot, especially since it was pretty much feature-complete at time of closing.

Screenshots

Current Troop setup

Most of the relevent sprites

Mission-start emblem

The HMS Brynhild (see mapdiffbot results for higher res link)

Kukri knife

Changelog

Copying what was originally put on Amory's PR for this

🆑
add: Much better RMC across the board (updated armor, presets, guns, skills)
add: RMC Troop (platoon)
balance: NSG buffed to be a viable weapon system
del: Goodbye old TWE naval ranks
mapadd: The HMS Brynhild shipmap & the Gibraltar dropship
/:cl:

commit 88b3bc1 Author: AmoryBlaine <[email protected]> Date: Wed Apr 9 22:48:22 2025 -0400 Update colonist.dm commit fcd216c Author: AmoryBlaine <[email protected]> Date: Wed Apr 9 22:46:28 2025 -0400 Update sniper_nest.dm commit 2540ae9 Author: AmoryBlaine <[email protected]> Date: Wed Apr 9 22:43:36 2025 -0400 Update royal_marines.dm commit 76eb0da Merge: 0e27978 f42638d Author: AmoryBlaine <[email protected]> Date: Wed Apr 9 22:39:38 2025 -0400 Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13 into RMC-de-shitification commit 0e27978 Author: AmoryBlaine <[email protected]> Date: Wed Apr 9 17:21:41 2025 -0400 Update vending.dmi commit 1fbe55d Author: AmoryBlaine <[email protected]> Date: Wed Apr 9 15:59:30 2025 -0400 Update vending.dmi commit d77dafe Author: AmoryBlaine <[email protected]> Date: Wed Apr 9 15:47:59 2025 -0400 Update royal_marines.dm commit cb4088c Author: AmoryBlaine <[email protected]> Date: Wed Apr 9 15:44:53 2025 -0400 Update royal_marines.dm commit 60bfa47 Author: AmoryBlaine <[email protected]> Date: Wed Apr 9 14:25:43 2025 -0400 Update royal_marines.dm commit 48232c5 Merge: 70c6a16 a688e1c Author: AmoryBlaine <[email protected]> Date: Wed Apr 9 14:18:38 2025 -0400 Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13 into RMC-de-shitification commit 70c6a16 Merge: e0cdac8 dd80a60 Author: AmoryBlaine <[email protected]> Date: Wed Apr 9 14:08:06 2025 -0400 Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13 into RMC-de-shitification commit e0cdac8 Merge: 874bcc7 2249a53 Author: AmoryBlaine <[email protected]> Date: Sun Apr 6 01:43:15 2025 -0400 Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13 into RMC-de-shitification commit 874bcc7 Author: AmoryBlaine <[email protected]> Date: Thu Apr 3 01:21:19 2025 -0400 yup commit f5f7300 Merge: e0974e0 b190850 Author: AmoryBlaine <[email protected]> Date: Wed Apr 2 14:38:50 2025 -0400 Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13 into RMC-de-shitification commit e0974e0 Author: AmoryBlaine <[email protected]> Date: Mon Mar 31 00:07:38 2025 -0400 yup commit f07baa2 Author: AmoryBlaine <[email protected]> Date: Sun Mar 30 11:11:25 2025 -0400 Update helmet_visors.dm commit 9f8e794 Author: AmoryBlaine <[email protected]> Date: Sat Mar 29 23:16:27 2025 -0400 yup commit 5933a59 Author: AmoryBlaine <[email protected]> Date: Sat Mar 29 22:18:52 2025 -0400 yup commit d61b61d Author: AmoryBlaine <[email protected]> Date: Sat Mar 29 21:56:02 2025 -0400 Update ert.dm commit 488c0e5 Author: AmoryBlaine <[email protected]> Date: Sat Mar 29 20:09:22 2025 -0400 Update royal_marines.dm commit 8c00396 Author: AmoryBlaine <[email protected]> Date: Sat Mar 29 00:38:28 2025 -0400 yup commit b07c2ef Author: AmoryBlaine <[email protected]> Date: Fri Mar 28 19:52:00 2025 -0400 Update colonialmarines.dme commit 117f43b Merge: f74f6ec 934ac37 Author: AmoryBlaine <[email protected]> Date: Fri Mar 28 19:39:38 2025 -0400 Merge branch 'master' into RMC-de-shitification commit f74f6ec Author: AmoryBlaine <[email protected]> Date: Thu Mar 27 13:54:19 2025 -0400 Update rifles.dm commit bcbc448 Author: AmoryBlaine <[email protected]> Date: Thu Mar 27 02:50:54 2025 -0400 yupp commit c39506a Author: AmoryBlaine <[email protected]> Date: Thu Mar 27 02:44:18 2025 -0400 Update colonialmarines.dme commit de4dd2c Author: AmoryBlaine <[email protected]> Date: Thu Mar 27 02:43:39 2025 -0400 yup commit e5dd2ab Author: AmoryBlaine <[email protected]> Date: Thu Mar 27 02:32:42 2025 -0400 yup commit ddecddf Author: AmoryBlaine <[email protected]> Date: Wed Mar 26 23:59:31 2025 -0400 yup commit 1be6020 Merge: 44d1910 08f2790 Author: AmoryBlaine <[email protected]> Date: Wed Mar 26 14:31:19 2025 -0400 Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13 into RMC-de-shitification commit 44d1910 Author: AmoryBlaine <[email protected]> Date: Wed Mar 26 14:30:31 2025 -0400 Update head_1.dmi commit b044cfd Author: AmoryBlaine <[email protected]> Date: Wed Mar 26 13:45:33 2025 -0400 yup commit 2254b29 Merge: b4d8562 384d501 Author: AmoryBlaine <[email protected]> Date: Tue Mar 25 17:08:22 2025 -0400 Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13 into RMC-de-shitification commit b4d8562 Merge: b75de8f 1af2c1c Author: AmoryBlaine <[email protected]> Date: Tue Mar 18 19:53:48 2025 -0400 Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13 into RMC-de-shitification commit b75de8f Merge: 574f04a 6bc0165 Author: AmoryBlaine <[email protected]> Date: Mon Mar 17 11:23:32 2025 -0400 Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13 into RMC-de-shitification commit 574f04a Author: AmoryBlaine <[email protected]> Date: Sun Mar 16 19:14:08 2025 -0400 yup commit 34832e0 Author: AmoryBlaine <[email protected]> Date: Sun Mar 16 16:46:34 2025 -0400 yup commit 9307ac5 Author: AmoryBlaine <[email protected]> Date: Fri Mar 14 17:08:59 2025 -0400 yup commit 77b851d Author: AmoryBlaine <[email protected]> Date: Thu Mar 13 16:30:19 2025 -0400 Update rifles.dm commit ee0e783 Author: AmoryBlaine <[email protected]> Date: Thu Mar 13 16:28:11 2025 -0400 Update rifles.dm commit b4df170 Author: AmoryBlaine <[email protected]> Date: Thu Mar 13 16:14:18 2025 -0400 yup commit a9a08a3 Author: AmoryBlaine <[email protected]> Date: Thu Mar 13 14:29:27 2025 -0400 Update royal_marines.dm commit 623299b Author: AmoryBlaine <[email protected]> Date: Thu Mar 13 14:24:39 2025 -0400 Update eyes.dmi commit d4dcbe5 Merge: a74e2de 07954bb Author: AmoryBlaine <[email protected]> Date: Thu Mar 13 14:04:33 2025 -0400 Merge branch 'RMC-de-shitification' of https://github.com/AmoryBlaine/PvE-CMSS13 into RMC-de-shitification commit a74e2de Merge: c4a3789 027518e Author: AmoryBlaine <[email protected]> Date: Thu Mar 13 14:04:26 2025 -0400 Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13 into RMC-de-shitification commit 07954bb Merge: c4a3789 027518e Author: AmoryBlaine <[email protected]> Date: Thu Mar 13 14:04:18 2025 -0400 Merge branch 'master' into RMC-de-shitification commit c4a3789 Author: AmoryBlaine <[email protected]> Date: Thu Mar 13 14:00:21 2025 -0400 yup commit 0e1944b Author: AmoryBlaine <[email protected]> Date: Thu Mar 13 12:44:10 2025 -0400 yup commit ac5dd5a Author: AmoryBlaine <[email protected]> Date: Thu Mar 13 11:26:39 2025 -0400 yup commit 6cf83eb Author: AmoryBlaine <[email protected]> Date: Thu Mar 13 11:19:58 2025 -0400 VP78 redux commit 1685c31 Author: AmoryBlaine <[email protected]> Date: Wed Mar 12 14:24:06 2025 -0400 yup commit cb173c3 Author: AmoryBlaine <[email protected]> Date: Wed Mar 12 13:46:15 2025 -0400 yup commit 83ce0fa Author: AmoryBlaine <[email protected]> Date: Wed Mar 12 13:23:22 2025 -0400 yup commit 1d38adf Author: AmoryBlaine <[email protected]> Date: Tue Mar 11 22:40:57 2025 -0400 Update head_1.dmi commit 80324bb Author: AmoryBlaine <[email protected]> Date: Tue Mar 11 22:37:51 2025 -0400 yup commit 34dae49 Author: AmoryBlaine <[email protected]> Date: Tue Mar 11 22:25:58 2025 -0400 yup commit d309df6 Author: AmoryBlaine <[email protected]> Date: Tue Mar 11 22:04:57 2025 -0400 Update royal_marines.dm commit b2c9407 Author: AmoryBlaine <[email protected]> Date: Tue Mar 11 22:02:51 2025 -0400 yup commit 287238a Merge: f1a0cc7 74a59c2 Author: AmoryBlaine <[email protected]> Date: Tue Mar 11 21:44:13 2025 -0400 Merge branch 'master' into RMC-de-shitification commit f1a0cc7 Author: AmoryBlaine <[email protected]> Date: Tue Mar 11 21:43:53 2025 -0400 yup commit 91a2fe1 Author: AmoryBlaine <[email protected]> Date: Tue Mar 11 21:28:39 2025 -0400 Update royal_marines.dm commit 32808e7 Author: AmoryBlaine <[email protected]> Date: Tue Mar 11 21:08:47 2025 -0400 yup commit 6ed36c6 Author: AmoryBlaine <[email protected]> Date: Tue Mar 11 20:53:39 2025 -0400 Update royal_marines.dm commit 1305492 Author: AmoryBlaine <[email protected]> Date: Tue Mar 11 20:44:06 2025 -0400 yup commit 96087b3 Author: AmoryBlaine <[email protected]> Date: Tue Mar 11 20:20:58 2025 -0400 yup commit c00883a Author: AmoryBlaine <[email protected]> Date: Tue Mar 11 20:18:45 2025 -0400 Update colonialmarines.dme commit f8eb895 Author: AmoryBlaine <[email protected]> Date: Tue Mar 11 20:13:48 2025 -0400 Update rifles.dm commit 504392c Author: AmoryBlaine <[email protected]> Date: Tue Mar 11 20:04:21 2025 -0400 yup commit 00243d7 Author: AmoryBlaine <[email protected]> Date: Tue Mar 11 19:20:57 2025 -0400 yup commit 7290679 Author: AmoryBlaine <[email protected]> Date: Tue Mar 11 19:14:47 2025 -0400 Update squad_wy.dm commit 2195558 Author: AmoryBlaine <[email protected]> Date: Tue Mar 11 19:12:10 2025 -0400 yup commit bce194c Author: AmoryBlaine <[email protected]> Date: Tue Mar 11 19:05:28 2025 -0400 yup commit 906c5a1 Author: AmoryBlaine <[email protected]> Date: Tue Mar 11 18:48:15 2025 -0400 yup commit 6d631a2 Author: AmoryBlaine <[email protected]> Date: Tue Mar 11 18:33:38 2025 -0400 yup commit d7cebaa Author: AmoryBlaine <[email protected]> Date: Tue Mar 11 18:29:09 2025 -0400 yup commit ff86da0 Author: AmoryBlaine <[email protected]> Date: Tue Mar 11 12:08:30 2025 -0400 yup

Fixes missed old-RMC-ranks left behind, changes the officer ranks to be RMC ones instead of unused TWE navy ones, renames RMC officer roles to match current marine commando nomenclature r.e. organisation (Platoon = Troop, Company = Squadron), Medic has become Medical Assitant, tweaks to some role-comm-titles too

cm13-github · 2025-04-22T23:54:39Z

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

cm13-github · 2025-04-22T23:54:39Z

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

cm13-github · 2025-04-23T00:19:20Z

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

cm13-github · 2025-04-24T03:41:28Z

PVECM: Blue

Merged By

Emilitia Ennehrt

Revision

Test Merge Deployed @ 05/16/2025 18:58:07 +00:00:

Server Instance

PVECM: Red

Merged By

lordloko

Revision

Origin: a3dbcb7
Pull Request: a1adfde
Server: 74facc98e2a8ea3e084e2b8ba8b8ebecadbf098a

Test Merge Updated @ 05/16/2025 19:08:56 +00:00:

Server Instance

PVECM: Red

Merged By

lordloko

Revision

Test Merge Deployed @ 05/25/2025 00:25:15 +00:00:

Server Instance

PVECM: Blue

Merged By

EmiSol

Revision

Test Merge Removed @ 05/29/2025 08:33:16 +00:00:

Server Instance

PVECM: Blue

Renames RMC job titles/roles for IDs Tweaks to paygrades to include royal navy medic & army royal engineers combat engi HUD icon for combat engi Skill tweaks, fireman carry upped to same as USCM, police skill removed, CQC, melee & jtac upped or given to roles missing them. Medic gets surg 2 but no fancy tools, engineer is on-par with CM engi Medic backpack & new (but recoloured) uniform sprites ported from RMC update PR on PvP PMC sniper helmet revived & RMC subtype made, given to royal marine sniper Lots of loadout changes NSG UGL changed to 3-shot one NSG burstfire delay reduced

Blacklist897 · 2025-04-26T00:46:22Z

I would either give them their own etool, or rename the USCM one to a generic version.

NSG UGL sprite reverted to use mk2 M41A one for visual difference RMC medic belt updated & applied to loadout Excess nade packs removed from presets, one at most for all RMC e-tool NSG description fixed to mention new calibre Combat Engineer -> Assault Engineer

More jobs defined, new icons for them RMC mortar & operator RMC Troop Sergeant, carries supplies, supports Troop Commander hAI faction stuff for RMC new sprites, more porting of stuff from the RMC up-arming on PvP

Help

cm13-github · 2025-05-23T17:38:00Z

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

cm13-github · 2025-05-23T21:43:32Z

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

cm13-github · 2025-05-24T02:49:26Z

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

Mostly sorting out lighting, a few access issues & the shipboard phones. Adjusts role splash text upon joining where needed too

cm13-github · 2025-05-25T21:04:58Z

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

cm13-github · 2025-05-26T01:58:20Z

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

Role title tweaks, SMG adjustment (range & damage reduction, slowdown on hit), access issues on the shipmap fixed, helmet visor tweaked, RMC first-responder pouch added to vendors (5 slot storage, adjusted carry list)

cm13-github · 2025-05-26T21:08:23Z

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

cm13-github · 2025-05-26T21:47:38Z

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

I want die Adds the DAA.4 'Nimrod' dropship, callsign Gibraltar TWE modification of a UD-4

BonniePandora added 2 commits April 18, 2025 16:48

BonniePandora requested review from Danilcus-W and Zonespace27 as code owners April 18, 2025 16:56

cmss13-ci bot added Sprites Mapping Feature Balance fix Removal labels Apr 18, 2025

Merge branch 'master' into RMC-revival

99d6cd3

maxo1243 approved these changes Apr 22, 2025

View reviewed changes

cm13-github added the Merge Conflict label Apr 22, 2025

Merge branch 'master' into RMC-revival

b7a5a06

cm13-github removed the Merge Conflict label Apr 23, 2025

BonniePandora added 3 commits April 24, 2025 19:38

Merge branch 'master' into RMC-revival

8e567c6

hAI stuff

8100200

BonniePandora added 7 commits April 26, 2025 03:23

Various tweaks

471448e

NSG UGL sprite reverted to use mk2 M41A one for visual difference RMC medic belt updated & applied to loadout Excess nade packs removed from presets, one at most for all RMC e-tool NSG description fixed to mention new calibre Combat Engineer -> Assault Engineer

Role comm tweaks

44f15ce

Scope-creep

7f89c96

More jobs defined, new icons for them RMC mortar & operator RMC Troop Sergeant, carries supplies, supports Troop Commander hAI faction stuff for RMC new sprites, more porting of stuff from the RMC up-arming on PvP

More RMC stuff

ba54974

Help

The beginnings of something

5bedb01

No alt-rank RMC LT

f44b4a8

Update royal_marines.dm

6d4353e

BonniePandora added 2 commits May 23, 2025 18:33

Guh?

e91738f

Merge branch 'master' into RMC-revival

f0b8303

cm13-github removed the Merge Conflict label May 23, 2025

cm13-github added the Merge Conflict label May 23, 2025

BonniePandora added 2 commits May 24, 2025 03:43

Brynhild LIVES

d7dcc47

Merge branch 'master' into RMC-revival

850019d

cm13-github removed the Merge Conflict label May 24, 2025

BonniePandora added 5 commits May 24, 2025 04:20

Didn't mean to nuke this

09fb9bd

Map tweaks & access adjustment

450a25f

Guh?

e8d1f64

Map tweaks

3152266

Mostly sorting out lighting, a few access issues & the shipboard phones. Adjusts role splash text upon joining where needed too

The HMS Placeholder is no more

57d4483

cm13-github added the Merge Conflict label May 25, 2025

BonniePandora added 2 commits May 26, 2025 02:54

Merge branch 'master' into RMC-revival

d194137

Update HMS_Brynhild.dmm

f01e812

cm13-github removed the Merge Conflict label May 26, 2025

awaga

99b6c44

Role title tweaks, SMG adjustment (range & damage reduction, slowdown on hit), access issues on the shipmap fixed, helmet visor tweaked, RMC first-responder pouch added to vendors (5 slot storage, adjusted carry list)

cm13-github added the Merge Conflict label May 26, 2025

BonniePandora added 2 commits May 26, 2025 22:46

Merge branch 'master' into RMC-revival

4c3badd

RMC NSG defaults to burst

c469d5e

cm13-github removed the Merge Conflict label May 26, 2025

BonniePandora added 2 commits May 29, 2025 07:46

RMC Dropship

c720e2d

I want die Adds the DAA.4 'Nimrod' dropship, callsign Gibraltar TWE modification of a UD-4

Merge branch 'master' into RMC-revival

94fd8b0

RMC revamp revived #912

Are you sure you want to change the base?

RMC revamp revived #912

Conversation

BonniePandora commented Apr 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

About the pull request

Explain why it's good for the game

Screenshots

Changelog

Uh oh!

cm13-github commented Apr 22, 2025

Uh oh!

cm13-github commented Apr 22, 2025

Uh oh!

cm13-github commented Apr 23, 2025

Uh oh!

cm13-github commented Apr 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Test merge deployment history:

Server Instance

Merged By

Revision

Server Instance

Server Instance

Merged By

Revision

Server Instance

Server Instance

Merged By

Revision

Server Instance

Server Instance

Merged By

Revision

Server Instance

Server Instance

Merged By

Revision

Server Instance

Server Instance

Merged By

Revision

Server Instance

Server Instance

Merged By

Revision

Server Instance

Merged By

Revision

Server Instance

Server Instance

Merged By

Revision

Server Instance

Merged By

Revision

Server Instance

Server Instance

Merged By

Revision

Server Instance

Merged By

Revision

Server Instance

Server Instance

Merged By

Revision

Server Instance

Merged By

Revision

Server Instance

Merged By

Revision

Server Instance

Merged By

Revision

Server Instance

Server Instance

Merged By

BonniePandora commented Apr 18, 2025 •

edited

Loading

cm13-github commented Apr 24, 2025 •

edited

Loading