Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CMB Riot Control Unit #6649

Open
wants to merge 60 commits into
base: master
Choose a base branch
from
Open

CMB Riot Control Unit #6649

wants to merge 60 commits into from

Conversation

Blundir
Copy link
Contributor

@Blundir Blundir commented Jul 7, 2024

About the pull request

Adds CMB Riot Control Unit, a riot supression/swat oriented unit, with equipment in between of lethal and non lethal, which makes them capable of fighting xenos more or less effectively.

dreamseeker_C7YPVwXQ6h

Their looks are mostly made up, but spec visuals are based on an artwork made a while ago.

dreamseeker_tZ6YqsbI2v

image

Added CMB Riot Control Unit ERT with a chance of spawn equal to CLF, PMC, Private Military Contractors, and others.

Resprited CMB badges:

Left old, right new
dreammaker_GeoIvxEjMl

Reference badge for example:

image

Also added id card mob sprites for these badges:

dreamseeker_OZSSCYYXEs

Added unique berets, helmet, armors, unifroms, helmet visor for the new unit.

Added new jobs: CMB Riot Control Officer, CMB Riot Control Synthetic, CMB Medical Technician, CMB Breaching Technician

Added custom black Spearhead revolver for Marshals, it has the same stats but different sprite, but most importantly, it can perform revolver tricks.

Added actual working CMB squad icons and made CMB utilize their own hud, instead of marine hud (people can just swap headset to marine one if they want marine hud).

dreamseeker_alWzqIQK1F

Cleaned up some broken chunks of marine hud code.

Fixes mp5 (copied from uzi), m81 gl (draw myself), m37-17 (it was in file, but named wrong) suit storage sprites, these will no longer be invisible while stored on armor.

Made some variations of belts, pouches, etc for the new unit.

Tweaked sec hud sprites of investigator cmb synth.

Tweaked normalpoint Spearhead bullet, added 15 damage to it (from 45 to 60), hp bullet has 75 damage (unchanged), and normalpoint one lost in damage output in scenarios where it should be winning, now normalpoint does better against armored targets (dealing 69 damage, 15 ap), hp one against unarmored (dealing 86 damage, 0 ap).

Tweaked mob sprite of SWAT sec hud goggles, because it was completely unrelated to the icon.

CMB synth and deputy survivors on Fiorina have been swapped for their riot control analogues, which completely matches their backstories.

All CMB survivors are now correctly of CMB faction and faction group.

CMB Armory on Solaris Ridge now has CMB Riot Control gear instead of generic riot gear.

CMB Armory on Trijent Damn now has CMB Riot Control gear instead of generic riot gear.

UA Armory on Fiorina now has one cmb locker, also added one CMB Riot Officer corpse on the map.

Added M16A5 (M16), CAR-15A3, (XM177), MP5A5 (MP5) reskins for the new unit, will add them on planetside where they fit in another pr.

Added new set of backpacks for the new unit, will add them in other places later.

dreamseeker_KWrPiWwgpG

dreamseeker_F5GCJDeD0W

Added blocking visuals and new sounds. Mostly a port of tgstation/tgstation#74998.

dreamseeker_Ei7q6bXXEH.mp4

Most of the equipment is correct with the xenopedia CMB article.

Majority of sprites by Crowford, discord tag sir.crow.

Hud sprites, m16a5, mp5a5, car15a3 sprites by me.

Explain why it's good for the game

Better variety, more content, adds intermediate ert between anchorpoint marines and cmb patrol, like the author of cmb ert intended.

Equipment and balance might need to be tweaked tho.

Testing Photographs and Procedure

dreamseeker_U7Drqc2t6M
dreamseeker_44mJUXcVFW
dreamseeker_sLdQ535k99
dreamseeker_yX7GkPo8Sr
dreamseeker_jV1E5W2TAf
dreamseeker_9Bs3AkSqkB
dreamseeker_U6yzaEwCFj

Changelog

🆑
add: CMB Riot Control Unit ERT, it can also be called via marshal distress beacon
add: added cmb riot control berets, uniforms, helmet, armors, visor
add: CMB survivors on Fiorina have been swapped with Riot Control analogue
add: Marshals (not deputies) now have unique Spearhead revolver capable of doing revolver tricks
add: revolvers capable of revolver tricks now have a bit of description about it
add: M16 ext mags, currenly only used by CMB Riot Control
add: CMB version of M51 shotgun, that comes with new rubber buckshot ammo
add: M16,XM177,MP5 modernized looking versions to fit better the logic and aesthetics
add: visual effects and sound when blocking
balance: made spearhead normalpoint bullet be more balanced (added 15 damage) in relation to the hp variant
balance: riot grenade launcher can now also shoot: sebb, smokes (non lethal), flahbangs, airburst smoke
balance: the Colonial Marshal now has the same endurance skill as Deputy (Marshal had lower)
del: CMB can no longer see marine squad hud by default
fix: CMB squad hud now exists and works
fix: mp5, m81 gl, m37-17 now have suit storage sprites
fix: CMB survivors now all have CMB faction and faction group
fix: fixed incorrect attachment placement on Spearhead revolver
fix: XM51 being impossible to rack
maptweak: added CMB riot gear on Solaris Ridge to CMB Armory, instead of the generic riot gear
maptweak: added CMB riot gear on Trijent Dam to CMB Armory, instead of the generic riot gear
maptweak: added CMB riot gear locker in UA armory on Fiorina, also added one CMB riot officer corpse on the map
imageadd: resprite of CMB badge, CMB badge now has unique icons on the mob
imageadd: added es4 WY pistol sprite in holster belt
imageadd: new lobby art image from Substance20 (the image itself is rather old, also needs server side edit)
imageadd: proper inhand sprites for m81 gl
/:cl:

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

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

@github-actions github-actions bot added Sprites Remove the soul from the game. Feature Feature coder badge Removal snap Fix Fix one bug, make ten more labels Jul 7, 2024
@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jul 7, 2024
@Blundir Blundir requested a review from Nanu308 as a code owner July 7, 2024 16:00
@github-actions github-actions bot added the Mapping did you remember to save in tgm format? label Jul 7, 2024
@Kaga-404
Copy link
Contributor

Kaga-404 commented Jul 8, 2024

Looks fantastic, though this is a good point to deal with the note that the 'CMB' terminology was never meant to be expanded into wider use.

Almost everything referred to as 'CMB' that's part of an ERT or otherwise is Colonial Marshals going to places outside of areas that they're stationed at, like Fiorina, should be swapped over to 'OCM' at some point.

The OCM is the actual organization, and where the "Colonial Marshal" part of CMB comes from, while "B(ureau)" is meant to refer to the local OCM police stations, or bureaus, in colonies and stations. So for example, the Spearhead is referred to as a CMB Revolver because there's a CMB in LV-624, that security room in SW Nexus. Most of the original names, typepaths, and descriptions that originally referred to the CMB came from similar cases, being intended for just placing onto maps with CMBs.

Would highly recommend doing that name-swap from CMB to OCM for the new additions here at least, helps with accuracy and it'll make the future update easier.

@github-actions github-actions bot added the Balance You need to be a professional veteran game maintainer to comprehend what is being done here. label Jul 9, 2024
@cm13-github
Copy link
Contributor

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

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

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

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jul 11, 2024
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Aug 16, 2024
@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Aug 18, 2024
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Aug 18, 2024
@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 Aug 21, 2024
@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 Aug 21, 2024
@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 Aug 22, 2024
@cm13-github
Copy link
Contributor

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

@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github added Merge Conflict PR can't be merged because it touched too much code and removed Merge Conflict PR can't be merged because it touched too much code labels Aug 22, 2024
@cm13-github
Copy link
Contributor

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

@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Aug 23, 2024
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Sep 1, 2024
@cm13-github
Copy link
Contributor

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

@Nanu308 Nanu308 added the Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. label Oct 13, 2024
Copy link
Member

@Nanu308 Nanu308 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

balance approved, things to look at if they turn into issues is the xm17 for the spec and surv's ammo for the cmb

Copy link
Contributor

@nauticall nauticall left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sprites

@nauticall nauticall added the Sprites Approved confirmed no stray pixels label Oct 26, 2024
@Blundir Blundir added Stale Exempt PR can't go stale Sprites Frozen Merge this and you will make the spritetainers angry. labels Oct 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Feature Feature coder badge Fix Fix one bug, make ten more Mapping Approved adds 500 new dict keys Mapping did you remember to save in tgm format? Merge Conflict PR can't be merged because it touched too much code Removal snap Sound Blast 5 minutes of bass boosted music to our players Sprites Approved confirmed no stray pixels Sprites Frozen Merge this and you will make the spritetainers angry. Sprites Remove the soul from the game. Stale Exempt PR can't go stale
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Spearhead Sprite Attachments
5 participants