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

Solar Devils ERT [PvE Marines] #6811

Merged
merged 16 commits into from
Aug 23, 2024
Merged

Conversation

Steelpoint
Copy link
Contributor

@Steelpoint Steelpoint commented Jul 28, 2024

About the pull request

In marking the merger of the PvP and PvE servers under a single banner, this PR sets to celebrate that by the addition of the 'Solar Devils' battalion as a (currently admin only) Emergency Response Team. The Solar Devils are similarly well equipped and trained as they appear in PvE.

This PR also adds some content from the PvE server to enhance the appearance of the Solar Devils to better fit their appearance, such as a battalion patch sprite.

These squads will spawn with, depending on if they are a half or full squad, 4 Riflemen, 2 Smartgunners, 2 Team Leaders, 1 Platoon Corpsman and 1 Platoon Leader. The Platoon Leader will only spawn with the 'Full Squad' ERT.

The squad are all armed with M41A Mk1's.


In terms of function. This PR adds two distress calls for admins to use, a Half-Squad and Full Squad deployment of either 5 or 10, respectively, Solar Devil Marines. They spawn with some unique equipment, and they all possess increased skills.

Explain why it's good for the game

Show of comradeship, and a small easter egg of the PvE server in PvP.

Testing Photographs and Procedure

Screenshot 2024-07-28 21 52 07

Changelog

🆑
add: In observance of the merger of the PvP and PvE servers of CM-SS13. The 'Solar Devils', the USCM battalion that appear in the PvE server, have been added as an admin only Emergency Response Team.
add: The Solar Devils are highly trained and well equipped by Marine standards, they will also spawn as part of their own squad.
imageadd: A 'Solar Devils' uniform patch accessory has been added.
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Feature Feature coder badge labels Jul 28, 2024
@sunofang
Copy link

sunofang commented Jul 29, 2024

We're so back, PVE bros.

But in all seriousness, why is the distress call admin-only?

@Steelpoint
Copy link
Contributor Author

We're so back, PVE bros.

But in all seriousness, why is the distress call admin-only?

Its easier to have something added if it does not affect the core-gameplay loop, furthermore this will not dilute the ERT pool further. If the power's that be judge this worthy of being in the main hijack loop I'll accede, even if I have to nerf their equipment.

@Merrgear
Copy link

Hi, gods gift to pve, literally the coolest gm ever here, you didnt give them spec buck and instead gave them the RA no one uses, marked for death

In all seriousness tho i think this is a cool little reference admins can throw, but id not be too in support of standardizing it for a couple reasons
1, It kind of adds to the illusion that the Sun Riders on the GArrow are better than the avg marine if they are in here rocking the improved skills and spawned on a regular basis, as if they were added to normal ERT. PVP refugees already struggle a bit with this cause they are used to the less lore accurate skillset
2, The RA being in gunny's hands, ESPECIALLY only him being trained to use it is something we have been trying to fight since it was introduced, it is not the gunny weapon, gunny is not for combat, gunny is supposed to issue it out, would make sense moreso as in a random rfm's hands than gunny. also wall piercing ammo would be much more accurate than the incind and normal mags, since thats the RA's gimmick (along with a stun but that wont transfer without code)
3, Smartgunners in pvp are so wimpy compared to PVE and rock different IFF, it would serve to further confuse players who come from pvp and go "well the ERT has it like that!!!!"

and the worst sin of all......its a platoon not a squad!!!!!!!!!!!!!!!!! marked for death in pve discord await your judgement

@Steelpoint
Copy link
Contributor Author

@Merrgear

It is worth taking into consideration I've somewhat moulded the squad within a balance framework of the PvP environment it is going to find itself playing in.

Whilst I appreciate that there are far more differences to a PvE versus PvP marine that this PR doesn't really touch, but I have neither the skills nor the time to make those differences far more pronounced than what is in the PR.

Nonetheless I will take your feedback in consideration and re-theme it that the Platoon Squad Leader won't spawn with a custom M4RA. At this stage I'll simply make all the Marines spawn with a M41A Mk1. I can not really buff the Smartgunner since that would require a lot of code work to implement the PvE SG mechanics for 1 role, same goes for the sentry guns the TL's spawn with.

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

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

@Kaga-404
Copy link
Contributor

Fun celebratory easteregg ERT, I like it.

Only one correction comes to mind at a first glance, which stems from PVE building on outdated unit structure charts, the 'USCM 2nd Division, 3rd Battalion' mentions.

Keeping it short, the USCM is organized into four Combat Divisions, split between 3 Marine Space Forces in cooperation with the USASF. 1st and 2nd belong to Sol, 3rd is Eridani, and 4th is Herculis, which includes the Almayer.

It's fine if they're from the 2nd CD since that also explains why they're better equipped, but below the Combat Divisions are the Regiments, then the Battalions, then a somewhat fuzzy composition of flexible Companies, Platoons, Squads, and Fireteams that vary between individual battalions, ships, and units.

For reference, the Almayer normally would have 2 companies, each made up of 4 squads/platoons. I'll leave the specifics of how the Golden Arrow is arranged up to you, but at least the 'Division, Battalion' layout should be corrected. The easiest change would be just sticking a regiment number in there ('USCM 2nd Combat Division, Xth Regiment, 3rd Battalion') but if you want to go more detailed then by all means.

code/modules/clothing/gloves/marine_gloves.dm Outdated Show resolved Hide resolved
code/datums/emergency_calls/solar_devils.dm Outdated Show resolved Hide resolved
code/modules/clothing/under/ties.dm Outdated Show resolved Hide resolved
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Aug 3, 2024
@cm13-github
Copy link
Contributor

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

@Steelpoint
Copy link
Contributor Author

Denoted changes made to better bring lore in-line with PvE.

Copy link
Contributor

@Kaga-404 Kaga-404 left a comment

Choose a reason for hiding this comment

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

Gave a grammar pass and fixed up the remaining unit stuff, should be good to go on the description and writing sides unless there's any questions

code/datums/emergency_calls/solar_devils.dm Outdated Show resolved Hide resolved
code/datums/emergency_calls/solar_devils.dm Outdated Show resolved Hide resolved
code/datums/emergency_calls/solar_devils.dm Outdated Show resolved Hide resolved
code/datums/emergency_calls/solar_devils.dm Outdated Show resolved Hide resolved
code/modules/clothing/under/ties.dm Outdated Show resolved Hide resolved
Copy link
Contributor

@Blundir Blundir left a comment

Choose a reason for hiding this comment

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

find a replacement for the patch sprite, current one looks messy

@Blundir Blundir marked this pull request as draft August 6, 2024 02:19
@Steelpoint
Copy link
Contributor Author

Steelpoint commented Aug 8, 2024

Replacement patch sprite added, thanks to @Blundir
Fixed up sentencing as noted as well.

@Steelpoint Steelpoint marked this pull request as ready for review August 8, 2024 07:53
Copy link
Contributor

@Blundir Blundir left a comment

Choose a reason for hiding this comment

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

sprites look good

@Blundir Blundir added the Sprites Approved confirmed no stray pixels label Aug 8, 2024
@Steelpoint
Copy link
Contributor Author

I'd be interested in allowing a half-squad to spawn as a ERT distress call but I'll leave the PR as is, unless the power's that be decide otherwise.

Steelpoint and others added 2 commits August 20, 2024 13:08
code/datums/skills/uscm.dm Outdated Show resolved Hide resolved
@Zonespace27 Zonespace27 marked this pull request as draft August 21, 2024 00:48
@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.

@Steelpoint
Copy link
Contributor Author

Issues attended to.

@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 21, 2024
@Steelpoint Steelpoint marked this pull request as ready for review August 21, 2024 04:06
code/modules/gear_presets/uscm.dm Outdated Show resolved Hide resolved
code/modules/gear_presets/uscm.dm Outdated Show resolved Hide resolved
code/modules/gear_presets/uscm.dm Outdated Show resolved Hide resolved
@harryob harryob marked this pull request as draft August 22, 2024 15:47
@Steelpoint
Copy link
Contributor Author

Removed leftover concepts.

@Steelpoint Steelpoint marked this pull request as ready for review August 23, 2024 13:57
@harryob harryob enabled auto-merge August 23, 2024 14:13
@harryob harryob added this pull request to the merge queue Aug 23, 2024
Merged via the queue into cmss13-devs:master with commit 5947249 Aug 23, 2024
28 checks passed
cm13-github added a commit that referenced this pull request Aug 23, 2024
@Steelpoint Steelpoint deleted the PvEMarines branch August 23, 2024 15:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants