-
Notifications
You must be signed in to change notification settings - Fork 177
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
base: master
Are you sure you want to change the base?
Conversation
Removed the demolitionist and M41As from the Leaders |
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 |
Test merge deployment history:Test Merge Deployed @ 04/06/2025 16:57:58 +00:00:Server InstancePVECM: Blue Merged Bylordloko RevisionOrigin: 2249a53 Test Merge Updated @ 04/06/2025 21:14:09 +00:00:Server InstancePVECM: Blue Merged ByKirsh RevisionOrigin: 2249a53 Test Merge Updated @ 04/07/2025 13:38:22 +00:00:Server InstancePVECM: Blue Merged ByThe32bitguy RevisionOrigin: 59a7196 Test Merge Updated @ 04/07/2025 16:09:37 +00:00:Server InstancePVECM: Blue Merged ByThe32bitguy RevisionOrigin: 59a7196 Test Merge Updated @ 04/08/2025 02:51:37 +00:00:Server InstancePVECM: Blue Merged ByThe32bitguy RevisionOrigin: 1c8b40b Test Merge Removed @ 04/08/2025 13:20:57 +00:00:Server InstancePVECM: Blue Test Merge Deployed @ 04/09/2025 17:05:52 +00:00:Server InstancePVECM: Red Merged ByEmiSol RevisionOrigin: dd80a60 Test Merge Deployed @ 04/09/2025 18:31:17 +00:00:Server InstancePVECM: Green Merged ByAthena14 RevisionOrigin: a688e1c Test Merge Removed @ 04/09/2025 21:39:38 +00:00:Server InstancePVECM: Red Test Merge Removed @ 04/11/2025 00:00:44 +00:00:Server InstancePVECM: Green Test Merge Deployed @ 04/13/2025 13:20:12 +00:00:Server InstancePVECM: Green Merged ByAthena14 RevisionOrigin: 785d59a Test Merge Removed @ 04/13/2025 13:24:58 +00:00:Server InstancePVECM: Green Test Merge Deployed @ 04/14/2025 18:11:50 +00:00:Server InstancePVECM: Green Merged ByAthena14 RevisionOrigin: a0c6796 Test Merge Removed @ 04/14/2025 18:30:21 +00:00:Server InstancePVECM: Green Test Merge Deployed @ 04/16/2025 18:43:05 +00:00:Server InstancePVECM: Green Merged Bylordloko RevisionOrigin: 463bff6 Test Merge Removed @ 04/17/2025 21:27:36 +00:00:Server InstancePVECM: Green Test Merge Deployed @ 04/25/2025 23:07:14 +00:00:Server InstancePVECM: Green Merged ByAthena14 RevisionOrigin: 20ee98d Test Merge Updated @ 04/26/2025 18:17:56 +00:00:Server InstancePVECM: Green Merged ByWettowels RevisionOrigin: 20ee98d Test Merge Removed @ 04/27/2025 15:28:26 +00:00:Server InstancePVECM: Green Test Merge Deployed @ 06/22/2025 13:14:48 +00:00:Server InstancePVECM: Blue Merged Bylordloko RevisionOrigin: abd3b29 Test Merge Removed @ 06/22/2025 17:29:30 +00:00:Server InstancePVECM: Blue Test Merge Deployed @ 06/23/2025 20:15:19 +00:00:Server InstancePVECM: Blue Merged Bylordloko RevisionOrigin: e6c14d5 Test Merge Removed @ 06/24/2025 03:09:21 +00:00:Server InstancePVECM: Blue Test Merge Deployed @ 06/24/2025 12:11:52 +00:00:Server InstancePVECM: Red Merged ByMessageCypher RevisionOrigin: e6c14d5 Test Merge Updated @ 06/24/2025 21:32:38 +00:00:Server InstancePVECM: Red Merged ByAndroBetel RevisionOrigin: e6c14d5 Test Merge Removed @ 06/25/2025 00:25:46 +00:00:Server InstancePVECM: Red Test Merge Deployed @ 06/27/2025 18:58:51 +00:00:Server InstancePVECM: Blue Merged Bylordloko RevisionOrigin: e6c14d5 Test Merge Updated @ 06/27/2025 19:05:18 +00:00:Server InstancePVECM: Blue Merged Bylordloko RevisionOrigin: e6c14d5 Test Merge Updated @ 06/27/2025 21:15:27 +00:00:Server InstancePVECM: Blue Merged Bylordloko RevisionOrigin: e6c14d5 Test Merge Removed @ 06/28/2025 01:05:43 +00:00:Server InstancePVECM: Blue Test Merge Deployed @ 06/29/2025 19:56:13 +00:00:Server InstancePVECM: Green Merged Bylordloko RevisionOrigin: 5d6f309 Test Merge Updated @ 06/29/2025 19:57:38 +00:00:Server InstancePVECM: Green Merged Bylordloko RevisionOrigin: 5d6f309 Test Merge Removed @ 06/30/2025 01:34:33 +00:00:Server InstancePVECM: Green |
Working on the HUD, unsure why it ain't working but I'll keep looking into it |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
HAI code fine
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
HAI fine
Conflicts have been resolved. A maintainer will review the pull request shortly. |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Conflicts have been resolved. A maintainer will review the pull request shortly. |
…MSS13 into UACG_Additions
code/modules/mob/living/carbon/human/ai/brain/ai_brain_factions.dm
Outdated
Show resolved
Hide resolved
assignment = "Colonial Militiaman Medic" | ||
paygrades = list(PAY_SHORT_AE4E = JOB_PLAYTIME_TIER_0) | ||
role_comm_title = "UACG-M" | ||
skills = /datum/skills/civilian/survivor/marshal/medic |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Inconsistent degrees of skill between the medic & engineer versus the troopers and leadership, why is it the med & tech get a multitude of skills beyond the expected fighting & job-specific sort?
Would make much more sense for them to simply use what they had prior, the army medic & engineer skillsets, helping reinforce the fact these guys aren't super-well trained compared to colonial marines
About the pull request
Adds a few (5) new UACG variants for props and the like. These include:
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
From left to right, top to bottom we have:
Standard Rifleman
[Demolitionist Removed]
Medic
NCO
Technician
Officer
Changelog
🆑
add: Added UACG Variants
/:cl: