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

Nightmare Insert: Trijent Dam - Crashed UPP Survivors #3845

Merged
merged 41 commits into from
Aug 4, 2023

Conversation

Steelpoint
Copy link
Contributor

@Steelpoint Steelpoint commented Jul 9, 2023

About the pull request

Starring
The UPP 173rd Airborne Reconnaissance Company, 2nd Platoon
Screenshot 2023-07-09 16 10 32

This PR adds a new nightmare insert to Trijent Dam that sees a small group of UPP survivors, post a crash landing in their Mi-220 Assault Gunship "Fulcrum", attempting to survive the xenomorph outbreak. Whilst successful in holding their ground despite their initial casualties, the group are now running low on ammunition and their equipment is starting to falter. Rescue is coming, but from whom? The Americans? Is the enemy of my enemy really our friend?


Technically speaking the PR will see the deployment of the following survivor roles

  • 4 Riflemen
  • 1 Non-Combat Synthetic
  • 2 Sappers
  • 2 Medics
  • 1 Specialist
  • 1 Squad Leader

Screenshot 2023-07-10 01 54 11
Squad Patch

The UPP are in dire straits and this is represented in game by them being spawned with a mish mash of armour and items. Only the Specialist and SL are guaranteed to spawn with full armour, everyone else is likely getting clothing or webbing. If a soldier spawns with webbing they will be given a flashlight in their suit storage slot.

Weapon's wise it is a even 33% chance for each role to either get a UPP Pulse Rifle, Pulse Carbine or a UPP Shotgun, with each only getting two spare mags/3 shell handfuls. The Specialist is guaranteed to get the UPP Pulse Rifle/Flamer. The mini-gun in the DS is a prop and non-functional.

The area is littered with mostly props or junk, the 'HEAP' ammo mags are all empty. There is a single ammo box of soft-point ammo set to around 120 rounds.

Every UPP member speaks Russian by default, with Chinese and German as their secondary languages. Only the SL and Synth can speak English.

The Synthetic has lesser equipment compared to its ERT counterpart and uses survivor synth skills. It has similar combat restrictions to its USCM counterpart.

The lore has been run past the lore channel and has been given a thumbs up.


Other Additions

  • External webbing can be clipped to UPP uniforms, which is used to facilitate some of the cosmetic options for the survivors.
  • New UPP logo has been added for documents and faxes. Official UPP documents now can look more official (see images for example).
  • UPP synthetics will now speak Russian as their first language instead of English

The PR (as far as I can tell) works and runs properly. I mostly have a few other tasks of moderate difficulty to finish.
To-Do

  • Add the UPP synth
  • Figure out how to get the UPP to spawn with random UPP names
  • Sprite the dropships side and rear wings
  • Expand the in-game lore and descriptions
  • Get spawn chances set to correct odds (20% ?)
  • BALANCE

Explain why it's good for the game

I believe that this would add further variety to the game in two respects.

Firstly, the UPP are a somewhat under-used aspect that generally only appear during events or as hostile ERT. Technically in-universe the USCM and UPP are in a cold war and are technically not at war, I believe that their introduction as a uncommon survivor spawn may provide some interesting opportunities for roleplay to occur, either from actual encounters between UPP and USCM personnel, or from the USCM finding the last stand of the UPP.

Secondly I think more variety in survivor roles is a boon for the game, and the opportunity to play as a UPP soldier in a non-ERT setting may present more opportunities for UPP roleplay to occur.

Testing Photographs and Procedure

Screenshots & Videos

2023-07-19 15 51 28
In game map as it stands

Screenshot 2023-07-09 16 10 32
Overview of the UPP as they stand

Screenshot 2023-07-10 01 54 11
Squad Patch

Screenshot 2023-07-11 12 09 54
Your Orders + UPP logo

Changelog

🆑
add: A team of UPP survivors may spawn on Trijent Dam.
mapadd: A new nightmare insert for Trijent Dam has been added, featuring a crashed UPP dropship.
/:cl:

@github-actions
Copy link
Contributor

github-actions bot commented Jul 9, 2023

You currently have a negative Fix/Feature pull request delta of -4. Maintainers may close this PR at will. Fixing issues or improving the codebase will improve this score.

@github-actions github-actions bot added Mapping did you remember to save in tgm format? Feature Feature coder badge labels Jul 9, 2023
@Steelpoint
Copy link
Contributor Author

If the addition of UPP as survivors is not something that can be accepted, I'll gladly reorient this PR to just add the crashed UPP ship as a purely cosmetic nightmare insert, with no UPP survivors spawning.

code/modules/clothing/under/marine_uniform.dm Outdated Show resolved Hide resolved
code/modules/clothing/under/marine_uniform.dm Outdated Show resolved Hide resolved
code/modules/clothing/under/marine_uniform.dm Outdated Show resolved Hide resolved
maps/Nightmare/maps/BigRed/nightmare.json Outdated Show resolved Hide resolved
@Steelpoint
Copy link
Contributor Author

insert is now for Trijent Dam

@Steelpoint Steelpoint changed the title Nightmare Insert: Big Red - Crashed UPP Survivors Nightmare Insert: Trijent Dam - Crashed UPP Survivors Jul 19, 2023
@Steelpoint
Copy link
Contributor Author

Steelpoint commented Jul 20, 2023

I've reworked the UPP survivors skillset to be more in-line with military survivors and less so an ERT.

@Steelpoint Steelpoint marked this pull request as ready for review July 20, 2023 10:41
code/modules/gear_presets/survivors.dm Outdated Show resolved Hide resolved
code/modules/gear_presets/survivors.dm Outdated Show resolved Hide resolved
code/modules/gear_presets/_select_equipment.dm Outdated Show resolved Hide resolved
code/modules/gear_presets/_select_equipment.dm Outdated Show resolved Hide resolved
code/modules/gear_presets/_select_equipment.dm Outdated Show resolved Hide resolved
code/modules/gear_presets/_select_equipment.dm Outdated Show resolved Hide resolved
code/modules/gear_presets/_select_equipment.dm Outdated Show resolved Hide resolved
code/modules/gear_presets/_select_equipment.dm Outdated Show resolved Hide resolved
@harryob harryob marked this pull request as draft July 25, 2023 07:11
@Steelpoint
Copy link
Contributor Author

All requested code changes have been made.

@Steelpoint Steelpoint marked this pull request as ready for review July 25, 2023 14:14
maps/Nightmare/maps/DesertDam/scenario.json Outdated Show resolved Hide resolved
code/modules/gear_presets/survivors.dm Outdated Show resolved Hide resolved
code/modules/gear_presets/survivors.dm Outdated Show resolved Hide resolved
code/modules/gear_presets/synths.dm Outdated Show resolved Hide resolved
code/modules/paperwork/paper.dm Outdated Show resolved Hide resolved
@harryob harryob marked this pull request as draft July 25, 2023 16:01
@Steelpoint Steelpoint marked this pull request as ready for review July 25, 2023 17:15
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.

Mapping

@Nanu308 Nanu308 marked this pull request as draft July 29, 2023 12:30
@Steelpoint
Copy link
Contributor Author

Requested changes made.

@Steelpoint Steelpoint marked this pull request as ready for review July 29, 2023 13:46
Copy link
Member

Choose a reason for hiding this comment

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

lgtm

@Nanu308 Nanu308 added the Mapping Approved adds 500 new dict keys label Jul 29, 2023
@harryob harryob added this pull request to the merge queue Aug 4, 2023
Merged via the queue into cmss13-devs:master with commit 9dc622a Aug 4, 2023
26 checks passed
cm13-github added a commit that referenced this pull request Aug 4, 2023
github-merge-queue bot pushed a commit that referenced this pull request Aug 7, 2023
# About the pull request

Followup to #3845.

# Explain why it's good for the game

Selfevident.

# Changelog
:cl:
fix: Non-UPP synthetics no longer default to speaking Russian.
/:cl:
@Steelpoint Steelpoint deleted the UPPShipSurv branch July 17, 2024 17:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Mapping Approved adds 500 new dict keys Mapping did you remember to save in tgm format?
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants