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

Updates the U.S.S.P with new looks and loadouts for admins v2 #20669

Merged
merged 15 commits into from Apr 22, 2023

Conversation

Henri215
Copy link
Member

@Henri215 Henri215 commented Mar 19, 2023

What Does This PR Do

Partially reopens #16250, made by Stokes52 and being done with his permission.
Adds equipment and uniforms so that the U.S.S.P. can finally be used as a proper minor faction.

  • New uniforms, jackets and hats, for Soviets in various ranks (see images)
  • New and updated outfit lists for admins to easily spawn the new Soviets
  • Soviet jobs will now show up on SecHUDs
  • Mobs now receive Neo-Russkiya language when soviet outfit is equipped.

Why It's Good For The Game

In theory, the soviets are a perfect candidate for fun and interesting events. They can be used in friendly, neutral or hostile roles depending on the context, but unfortunately their existing implementation left much to be desired in both form and function.

This PR was inspired in part by the recent SolGov improvements. Now, the Soviets have enough interesting equipment of their own to act as a balance or counter to SolGov. Variety is the spice of life, and If these changes are approved by maintainers and enjoyed by the players, it can lay a foundation for future expansions to the U.S.S.P.

Images of changes

Soviet Box:
image

Soviet Headset
image

Outfit Lists:

Updated admin quick outfit selection for Soviets.

Soviet Tourist
image
Mostly harmless. Probably visiting from a nearby station on holiday.

Soviet Conscript.
image
The last line of defense. Poorly armed with a bolt action rifle, a bayonet, some ammo, and a nagant revolver when all else fails. Would probably be pretty entertaining for the ghosts watching these guys try to fight anything.

Soviet Soldier
image
Generic soldier. Carries an APS automatic pistol and some ammo. Perfect for guard duty or more peaceful events.

Soviet Officer
image
For when you need someone to be in charge. Carries a classic russian .357 as his sidearm.

Soviet Admiral
image
No longer wears that awful pirate suit, he's now got his own fancy uniform!

Testing

  • Spawned multiple humans and gave them different soviet loadouts.
  • Verified their hud icons.
  • Verified loadout contents

Changelog

🆑 Henri215, Stokes52
add: New uniforms, coats and hats for Soviets
add: Soviet jobs now appear on the SecHUD
tweak: New admin outfit lists for easily spawning the updated Soviets
tweak: Mobs now receive Neo-Russkiya language when soviet outfit is equipped
/:cl:

@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally Sprites This PR modifies the game sprites labels Mar 19, 2023
@S34NW
Copy link
Member

S34NW commented Mar 19, 2023

I like this, but your soviet box is not in the correct style (as all the other boxes are). We updated all our boxes after the initial attempt at this PR, please update your box.

@Henri215
Copy link
Member Author

I like this, but your soviet box is not in the correct style (as all the other boxes are). We updated all our boxes after the initial attempt at this PR, please update your box.

I am aware but Stokes52 wont be able to update it, if i dont find someone to update it soon then it will be removed.

@Henri215
Copy link
Member Author

Soviet box with better perspective has been added.

@Henri215
Copy link
Member Author

Added soviet headset version, utilizes spec ops channel.

@github-actions github-actions bot added the Merge Conflict This PR is merge conflicted label Mar 20, 2023
@farie82 farie82 added the Feature This PR is a new addition to the game label Mar 21, 2023
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting approval This PR is waiting for approval internally -Status: Awaiting review This PR is awaiting review from the review team and removed -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally -Status: Awaiting approval This PR is waiting for approval internally labels Mar 21, 2023
@github-actions github-actions bot removed the Merge Conflict This PR is merge conflicted label Mar 22, 2023
@Henri215
Copy link
Member Author

image

How the loadouts look with the new headset.

code/modules/clothing/suits/misc_suits.dm Outdated Show resolved Hide resolved
code/game/jobs/access.dm Outdated Show resolved Hide resolved
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting merge This PR is ready for merge and removed -Status: Awaiting review This PR is awaiting review from the review team labels Apr 3, 2023
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
@github-actions github-actions bot added the Merge Conflict This PR is merge conflicted label Apr 4, 2023
@github-actions github-actions bot removed the Merge Conflict This PR is merge conflicted label Apr 4, 2023
@farie82 farie82 merged commit 72402e7 into ParadiseSS13:master Apr 22, 2023
14 checks passed
unknownuser782 pushed a commit to unknownuser782/Paradise that referenced this pull request Jun 4, 2023
…seSS13#20669)

* Custom USSP roles for admins

* Added the sprites for new USSP

* conflict part 2

* Elder Gods please make this work

* new style for soviet box

* Added Soviet headset

* lets fix this conflict

* Die conflict!

* Sirryan review

* Apply suggestions from code review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Lets solve this conflict

* Die conflict!

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
-Status: Awaiting merge This PR is ready for merge Feature This PR is a new addition to the game Sprites This PR modifies the game sprites
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants