Skip to content

UA Colonial Guard | Additional sub-roles for Props #879

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

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

Conversation

CactusMouth
Copy link

@CactusMouth CactusMouth commented Apr 6, 2025

About the pull request

Adds a few (5) new UACG variants for props and the like. These include:

  • UACG Medic, given basic medical training and a belt of meds
  • UACG Technician, able to drive and given tools + metal and skills.
  • [Demolitionist removed]
  • UACG NCO, leader and given an M41A MK1
  • UACG Officer, CO given an M41A MK1 and a fancy beret.

One of my first real PRs for PVE, so advice and tips on improving these are welcome.

Explain why it's good for the game

So that GMs don't have to spend half an hour setting up the gaggle of props and so that the UACG are somewhat more competent. Somewhat.

Testing Photographs and Procedure

image
From left to right, top to bottom we have:
Standard Rifleman
[Demolitionist Removed]
Medic
NCO
Technician
Officer

Changelog

🆑
add: Added UACG Variants
/:cl:

@cmss13-ci cmss13-ci bot added the Feature label Apr 6, 2025
@CactusMouth
Copy link
Author

Removed the demolitionist and M41As from the Leaders

@BisLordLoko
Copy link
Contributor

Finally. I was waiting this a lot, but:

1 - You need to also add the LatAm subtypes for the new presets

2 - I think UACG should use US Army paygrades rather then USCM. It's more of a personal taste thing, because it helps to make them more unique and helps when you glance at the chat bar it helps to emphasize these character are not from the USCM. You can find them at paygrades\factions\uscm\army.dm

@cm13-github
Copy link
Contributor

cm13-github commented Apr 6, 2025

Test merge deployment history:

Test Merge Deployed @ 04/06/2025 16:57:58 +00:00:
Server Instance

PVECM: Blue

Merged By

lordloko

Revision

Origin: 2249a53
Pull Request: 132a0f7
Server: cdb956e66e8d053aa1054bdcf084f5c4c453ba24

Test Merge Updated @ 04/06/2025 21:14:09 +00:00:
Server Instance

PVECM: Blue

Merged By

Kirsh

Revision

Origin: 2249a53
Pull Request: 132a0f7
Server: 15347e3a232b37c69c0433d0fa88e48a6be2548c

Test Merge Updated @ 04/07/2025 13:38:22 +00:00:
Server Instance

PVECM: Blue

Merged By

The32bitguy

Revision

Origin: 59a7196
Pull Request: b1c037d
Server: 8c30fd872cc1fab7da3c4e02788654c66cd2c99c

Test Merge Updated @ 04/07/2025 16:09:37 +00:00:
Server Instance

PVECM: Blue

Merged By

The32bitguy

Revision

Origin: 59a7196
Pull Request: fa1fba6
Server: 9e15781783b25d561d5eb23f4457e9e0d5ae92f1

Test Merge Updated @ 04/08/2025 02:51:37 +00:00:
Server Instance

PVECM: Blue

Merged By

The32bitguy

Revision

Origin: 1c8b40b
Pull Request: fa1fba6
Server: bbe038f51923a785cf730a16b183739b9227c840

Test Merge Removed @ 04/08/2025 13:20:57 +00:00:
Server Instance

PVECM: Blue

Test Merge Deployed @ 04/09/2025 17:05:52 +00:00:
Server Instance

PVECM: Red

Merged By

EmiSol

Revision

Origin: dd80a60
Pull Request: fa1fba6
Server: 0c22d8ba2eb09f3b5296fbeed98af62b19dcde22

Test Merge Deployed @ 04/09/2025 18:31:17 +00:00:
Server Instance

PVECM: Green

Merged By

Athena14

Revision

Origin: a688e1c
Pull Request: fa1fba6
Server: 83d05af52cba531a966069e3d1218c604c8ac10f

Test Merge Removed @ 04/09/2025 21:39:38 +00:00:
Server Instance

PVECM: Red

Test Merge Removed @ 04/11/2025 00:00:44 +00:00:
Server Instance

PVECM: Green

Test Merge Deployed @ 04/13/2025 13:20:12 +00:00:
Server Instance

PVECM: Green

Merged By

Athena14

Revision

Origin: 785d59a
Pull Request: fc140d7
Server: c3f0b56f43e2bce78f1212ca0a084b1210b5d017

Test Merge Removed @ 04/13/2025 13:24:58 +00:00:
Server Instance

PVECM: Green

Test Merge Deployed @ 04/14/2025 18:11:50 +00:00:
Server Instance

PVECM: Green

Merged By

Athena14

Revision

Origin: a0c6796
Pull Request: fc140d7
Server: c6636601f358d376f4831db4063ef2cca27d3317

Test Merge Removed @ 04/14/2025 18:30:21 +00:00:
Server Instance

PVECM: Green

Test Merge Deployed @ 04/16/2025 18:43:05 +00:00:
Server Instance

PVECM: Green

Merged By

lordloko

Revision

Origin: 463bff6
Pull Request: fc140d7
Server: 9b5b67c6848e49ce2a65b23ee718f88079d7a138

Test Merge Removed @ 04/17/2025 21:27:36 +00:00:
Server Instance

PVECM: Green

Test Merge Deployed @ 04/25/2025 23:07:14 +00:00:
Server Instance

PVECM: Green

Merged By

Athena14

Revision

Origin: 20ee98d
Pull Request: 12f4727
Server: bf1f1e719786b17ff92d091b35c95787ab5cd759

Test Merge Updated @ 04/26/2025 18:17:56 +00:00:
Server Instance

PVECM: Green

Merged By

Wettowels

Revision

Origin: 20ee98d
Pull Request: 12f4727
Server: ef76ec7a260a930d4b5350a742d0e25d4dd6f577

Test Merge Removed @ 04/27/2025 15:28:26 +00:00:
Server Instance

PVECM: Green

@CactusMouth
Copy link
Author

Working on the HUD, unsure why it ain't working but I'll keep looking into it

Zonespace27
Zonespace27 previously approved these changes Apr 13, 2025
Copy link
Contributor

@Zonespace27 Zonespace27 left a comment

Choose a reason for hiding this comment

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

HAI code fine

@BonniePandora
Copy link
Contributor

Few things from seeing them used in a recent round;

  • All the UACG get SG skills from the imediacy, might wish to nix all but the officer's spec skill? Ultimately eh
  • UACG medic comes with surgery 2. That's doctor level, for a medic. Also scuffed kit org? Suggest looking at army CMT loadout meds-wise for inspiration

@CactusMouth
Copy link
Author

CactusMouth commented Apr 17, 2025

Few things from seeing them used in a recent round;

  • All the UACG get SG skills from the imediacy, might wish to nix all but the officer's spec skill? Ultimately eh
  • UACG medic comes with surgery 2. That's doctor level, for a medic. Also scuffed kit org? Suggest looking at army CMT loadout meds-wise for inspiration

Fixed the skills to be in-line with the Army. Medic has also now been given a basic surgery kit and supplies

@cm13-github
Copy link
Contributor

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

@cmss13-ci
Copy link
Contributor

cmss13-ci bot commented May 15, 2025

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 14 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@cmss13-ci cmss13-ci bot added the Stale label May 15, 2025
@cmss13-ci cmss13-ci bot added the UI label May 16, 2025
Zonespace27
Zonespace27 previously approved these changes May 17, 2025
Copy link
Contributor

@Zonespace27 Zonespace27 left a comment

Choose a reason for hiding this comment

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

HAI fine

@cmss13-ci cmss13-ci bot closed this Jun 1, 2025
@BonniePandora BonniePandora reopened this Jun 12, 2025
@cm13-github
Copy link
Contributor

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

@cmss13-ci cmss13-ci bot removed the Stale label Jun 13, 2025
@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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants