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.

Sign up for GitHub

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

Jump to bottom

Private Security Hardsuit and New Merc Loadout Options #1445

Merged
merged 9 commits into from
Jun 7, 2024
Merged

Private Security Hardsuit and New Merc Loadout Options #1445

merged 9 commits into from
Jun 7, 2024

Conversation

MagnusCrowe
Copy link
Contributor

@MagnusCrowe MagnusCrowe commented May 30, 2024 •
edited
Loading

About the PR

This PR adds a new version of the mercenary hardsuit, the private security hardsuit. It has the same stats as the merc hardsuit, it merely looks different.

This PR also adds a number of private security themed items to the merc loadout, including:

  • Private Security Uniforms
  • Security backpacks
  • Security helmet and red security beret
  • Security gas mask
  • Security belt

Why / Balance

I want to play a merc but would rather look like a hired private security dude than a paramilitary olive man.

I feel like I've retained the visual distinctiveness from NFSD so there shouldn't be anyone confusing a private security hardsuit from an NFSD member.

Media

image
imageimageimageimage
image
Researchable and craftable at a protolathe.
image
Loadout example.

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Changelog

🆑 MagnusCrowe

  • add: Private Security Hardsuit.
  • add: Private security cosmetic options to merc loadout.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented May 30, 2024 •
edited
Loading

RSI Diff Bot; head commit ec9a853 merging into 0e7107b
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi

State Old New Status
icon-flash Added
icon Added
off-equipped-HELMET Added
on-equipped-HELMET Added

Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Edit: diff updated after ec9a853

@MagnusCrowe MagnusCrowe requested review from Cheackraze and dvir001 May 30, 2024 06:55
@github-actions github-actions bot added Status: Needs Review This PR is awaiting reviews Merge Conflict This PR has conflicts that prevent merging labels May 30, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jun 1, 2024

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

@github-actions github-actions bot removed the Merge Conflict This PR has conflicts that prevent merging label Jun 3, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jun 6, 2024

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

@github-actions github-actions bot added the Merge Conflict This PR has conflicts that prevent merging label Jun 6, 2024
@github-actions github-actions bot removed the Merge Conflict This PR has conflicts that prevent merging label Jun 6, 2024
@dvir001
Copy link
Contributor

dvir001 commented Jun 7, 2024

Im not a big fan of giving merc security gear since it might confuse new players seeing someone walking in sec gear.
but since its just the utility + new suits its probably fine overall

@dvir001
Copy link
Contributor

dvir001 commented Jun 7, 2024

I also fixed the merc suit missing the gas mask comp.

@dvir001 dvir001 merged commit 280e6be into new-frontiers-14:master Jun 7, 2024
14 checks passed
FrontierATC added a commit that referenced this pull request Jun 7, 2024
@FrontierATC
Automatic Changelog (#1445)
7ed77cd
@MagnusCrowe
Copy link
Contributor Author

I also fixed the merc suit missing the gas mask comp.

Bless you kind stranger

blueDev2 added a commit to blueDev2/frontier-station-14 that referenced this pull request Jun 11, 2024
@blueDev2
Squashed commit of the following:
e938a69 
commit c7d7e7b
Author: FrontierATC <[email protected]>
Date:   Tue Jun 11 22:04:03 2024 +0000

    Automatic Changelog (new-frontiers-14#1437)

commit 0937fac
Author: Dvir <[email protected]>
Date:   Wed Jun 12 01:03:34 2024 +0300

    Cats Carp Suit (new-frontiers-14#1437)

    * SuitUp

    * Fix

    * Fix

    * Update pets.yml

    * Update pets.yml

    * Update pets.yml

    * Update pets.yml

commit 27356d5
Author: FrontierATC <[email protected]>
Date:   Tue Jun 11 19:18:08 2024 +0000

    Automatic Changelog (new-frontiers-14#1500)

commit f2076bb
Author: TsjipTsjip <[email protected]>
Date:   Tue Jun 11 21:17:43 2024 +0200

    Pen signing rework (new-frontiers-14#1500)

    * Port pen signing from Sector-Umbra/Sector-Umbra#47

    * Remove stampedBorderless references in maps from old signing system

    * Remove the existence of PenComponent

commit 4d053b7
Author: FrontierATC <[email protected]>
Date:   Tue Jun 11 18:52:32 2024 +0000

    Automatic Changelog (new-frontiers-14#1487)

commit 3d61b18
Author: ErhardSteinhauer <[email protected]>
Date:   Tue Jun 11 21:52:05 2024 +0300

    Construction Bag (new-frontiers-14#1487)

    * initial commit

    * Un Tag

    * fixes

    * no tickets

    * research thingy

    * inflatable walls, shared.comp

    ---------

    Co-authored-by: Dvir <[email protected]>

commit df97e8b
Author: FrontierATC <[email protected]>
Date:   Tue Jun 11 18:12:07 2024 +0000

    Automatic Changelog (new-frontiers-14#1491)

commit 4839227
Author: Whatstone <[email protected]>
Date:   Tue Jun 11 14:11:38 2024 -0400

    Loadouts: add overrides for name, description, and preview entity (new-frontiers-14#1491)

    * Add loadout name, desc, preview entity overrides

    * Fix for nullable fields

    * Add survival box

    * Update survival.yml

    * More edits

    ---------

    Co-authored-by: Dvir <[email protected]>

commit 32df6dc
Author: FrontierATC <[email protected]>
Date:   Mon Jun 10 15:37:29 2024 +0000

    Automatic Changelog (new-frontiers-14#1497)

commit 328edff
Author: GreaseMonk <[email protected]>
Date:   Mon Jun 10 17:37:03 2024 +0200

    Fix artifact fragment spawn rate (new-frontiers-14#1497)

commit a120ab2
Merge: d4b5016 2707d95
Author: GreaseMonk <[email protected]>
Date:   Mon Jun 10 10:51:22 2024 +0200

    Merge pull request new-frontiers-14#1431 from dvir001/2024-05-28-HTNSystem

    Update HTNSystem.cs

commit d4b5016
Author: FrontierATC <[email protected]>
Date:   Sun Jun 9 17:53:33 2024 +0000

    Automatic Changelog (new-frontiers-14#1214)

commit 55c772f
Author: Tych0 <[email protected]>
Date:   Sun Jun 9 18:53:08 2024 +0100

    NSF Broadhead (New) - Medium Detective NSFD Vessel (new-frontiers-14#1214)

    * Adds the NSF Broadhead, a new medium size detective-oriented NSFD shuttle.

    * Update Broadhead after review

    * Removed old files after relocating them to the correct dir

    * Security thrusters/gyro are now NFSD versions

    * Updates to new prototype names

    * Made requested changes and some other stuff

    ---------

    Co-authored-by: Maxtone <[email protected]>

commit 4792913
Author: FrontierATC <[email protected]>
Date:   Sat Jun 8 22:02:00 2024 +0000

    Automatic Changelog (new-frontiers-14#1493)

commit de69cf9
Author: Whatstone <[email protected]>
Date:   Sat Jun 8 18:01:36 2024 -0400

    Add wanted status, job icon, health icon to Brigmedic HUD (new-frontiers-14#1493)

    * Brigmedic HUD: inherit from NFSD HUD

    * Brigmedic: reparent under med & nfsd huds

commit 73ecff4
Author: Dvir <[email protected]>
Date:   Sat Jun 8 20:55:09 2024 +0300

    Fix mech codes to stop AI abuse (new-frontiers-14#1492)

    * Fix Mechs

    * Update Content.Server/Mech/Systems/MechSystem.cs

    Was

    Co-authored-by: Whatstone <[email protected]>

    * Update Content.Server/Mech/Systems/MechSystem.cs

    Sure

    Co-authored-by: Whatstone <[email protected]>

    * Update Content.Shared/Mech/EntitySystems/SharedMechSystem.cs

    Co-authored-by: Whatstone <[email protected]>

    ---------

    Co-authored-by: Whatstone <[email protected]>

commit a8c22c7
Author: FrontierATC <[email protected]>
Date:   Sat Jun 8 14:41:07 2024 +0000

    Automatic Changelog (new-frontiers-14#1490)

commit e9c2534
Author: AndresE55 <[email protected]>
Date:   Sat Jun 8 10:40:33 2024 -0400

    Dropping Corpses Devoured by Space Dragons on Gib/Butcher. (#28709) (new-frontiers-14#1490)

    * Update DevourSystem.cs

    * Update DevourSystem.cs

    * Update Content.Server/Devour/DevourSystem.cs

    ---------

    Co-authored-by: Lyndomen <[email protected]>
    Co-authored-by: metalgearsloth <[email protected]>

commit 0ad77b4
Author: FrontierATC <[email protected]>
Date:   Fri Jun 7 21:53:26 2024 +0000

    Automatic Changelog (new-frontiers-14#1305)

commit 8342e26
Author: Dvir <[email protected]>
Date:   Sat Jun 8 00:52:59 2024 +0300

    Mail Truck (Update) (new-frontiers-14#1305)

    * Mail

    * Update mailtruck.yml

    * Update mailtruck.yml

    * Update mailtruck.yml

commit de8a049
Author: FrontierATC <[email protected]>
Date:   Fri Jun 7 17:10:44 2024 +0000

    Automatic Changelog (new-frontiers-14#1473)

commit 53dd031
Author: Dvir <[email protected]>
Date:   Fri Jun 7 20:10:14 2024 +0300

    Mail Buff (new-frontiers-14#1473)

    * MailUp

    * Update base_mail.yml

    * Update base_mail.yml

    * Update MailTeleporterComponent.cs

    * Update MailComponent.cs

    * Update base_mail.yml

    * Update base_mail.yml

    * Update Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml

    Sure

    Co-authored-by: Whatstone <[email protected]>

    ---------

    Co-authored-by: Whatstone <[email protected]>

commit 7e0de7c
Author: Hamblinius <[email protected]>
Date:   Fri Jun 7 16:35:20 2024 +0100

    Brown Flat Cap in Loadouts (new-frontiers-14#1483)

    * Brown Flat Cap in Loadouts
    This PR adds the brown flat cap to the loadouts for the contractor, pilot, and mercenary.
    The grey flat cap is available in the loadouts but the brown one was conspicuously absent (and I need a cool hat that matches my outfit).
    ![](https://files.catbox.moe/unsvyu.png)
    ![](https://files.catbox.moe/vi8osp.png)

    * Update stationrep_loadout_groups.yml

    ---------

    Co-authored-by: Dvir <[email protected]>

commit 2eb75fe
Author: SirMcSlushers <[email protected]>
Date:   Fri Jun 7 10:59:47 2024 -0400

    Nonlethal Vending Machine (Practice Rounds & Etc) (new-frontiers-14#1352)

    * Nonlethal Vending Machine (Practice Rounds & Etc)

    * Updated

    * Updated

    * Added the Restocking

    * Update meta.json

    * Cleanup

    * Update eject-unshaded.png

    * Fixup

    ---------

    Co-authored-by: Dvir <[email protected]>

commit c8eee32
Author: FrontierATC <[email protected]>
Date:   Fri Jun 7 10:59:04 2024 +0000

    Automatic Changelog (new-frontiers-14#1474)

commit 4ebccb1
Author: Whatstone <[email protected]>
Date:   Fri Jun 7 06:58:39 2024 -0400

    Restore rubber rounds to nfsd techfab, r&d server (new-frontiers-14#1474)

commit 7ed77cd
Author: FrontierATC <[email protected]>
Date:   Fri Jun 7 09:53:41 2024 +0000

    Automatic Changelog (new-frontiers-14#1445)

commit 280e6be
Author: Maxtone <[email protected]>
Date:   Fri Jun 7 04:53:14 2024 -0500

    Private Security Hardsuit and New Merc Loadout Options (new-frontiers-14#1445)

    * phase 1

    * Suit and extra loadout options for merc

    * inhand update

    * Update mercenary_loadout_groups.yml

    * Update hardsuit-helmets.yml

    ---------

    Co-authored-by: Dvir <[email protected]>
    Co-authored-by: Dvir <[email protected]>

commit d502a41
Author: FrontierATC <[email protected]>
Date:   Fri Jun 7 07:50:39 2024 +0000

    Automatic Changelog (new-frontiers-14#1485)

commit 74d4232
Author: Checkraze <[email protected]>
Date:   Fri Jun 7 03:50:15 2024 -0400

    mining crab and golem rebalance (new-frontiers-14#1485)

commit 0dbdf75
Author: AndresE55 <[email protected]>
Date:   Thu Jun 6 18:39:08 2024 -0400

    anchor trade station into place (new-frontiers-14#1484)

commit 0e7107b
Author: whatston3 <[email protected]>
Date:   Thu Jun 6 02:23:33 2024 -0400

    Non-lethal Mosin: inherit mag size from parent (new-frontiers-14#1479)

commit c928f0f
Author: FrontierATC <[email protected]>
Date:   Thu Jun 6 00:23:25 2024 +0000

    Automatic Changelog (new-frontiers-14#1454)

commit 5dbdb0c
Author: ErhardSteinhauer <[email protected]>
Date:   Thu Jun 6 03:22:52 2024 +0300

    Military Jumpsuits (new-frontiers-14#1454)

    * initial commit

    * update

    * fixes

    * loadouts

    * name change

    * fix

    * moved new jumpsuits behind T3 time lock

commit 7f318fe
Author: FrontierATC <[email protected]>
Date:   Thu Jun 6 00:19:36 2024 +0000

    Automatic Changelog (new-frontiers-14#1468)

commit f2a26be
Author: whatston3 <[email protected]>
Date:   Wed Jun 5 20:18:23 2024 -0400

    Loadouts: fix Lawyer, Janitor slot names, remove Chaplain loadout (new-frontiers-14#1468)

    * Janitor, Lawyer, Chaplain NF loadouts

    * role_loadouts.yml: fix chaplain outer clothing

    * Remove chaplain loadout files, no job pref listing

commit b4274c1
Author: FrontierATC <[email protected]>
Date:   Thu Jun 6 00:17:12 2024 +0000

    Automatic Changelog (new-frontiers-14#1432)

commit 6347758
Author: Dvir <[email protected]>
Date:   Thu Jun 6 03:16:47 2024 +0300

    PDA Bank Data (new-frontiers-14#1432)

    * Bank data

    * Data

    * Update Content.Client/PDA/PdaMenu.xaml.cs

    Co-authored-by: whatston3 <[email protected]>

    ---------

    Co-authored-by: Checkraze <[email protected]>
    Co-authored-by: whatston3 <[email protected]>

commit 2e94949
Author: Dvir <[email protected]>
Date:   Thu Jun 6 02:53:15 2024 +0300

    Canisters Sprites (Update) (new-frontiers-14#1409)

    * Canisters

    * Liquid

    * Update meta.json

    * Update gas_canisters.yml

    * Update meta.json

    * Fix

    * Create gas_canisters.yml

    * Update gas_canisters.yml

    * Update gas_canisters.yml

commit 58f6678
Author: FrontierATC <[email protected]>
Date:   Wed Jun 5 23:49:21 2024 +0000

    Automatic Changelog (new-frontiers-14#1466)

commit 3df6203
Author: Maxtone <[email protected]>
Date:   Wed Jun 5 18:48:58 2024 -0500

    Trade Outpost (New POI) (new-frontiers-14#1466)

    * Trade phase 1

    * Trade Phase 2, clean station

    * Phase 3 - new signs

    * Update whitelist.yml

    ---------

    Co-authored-by: Dvir <[email protected]>

commit 0bdc032
Author: FrontierATC <[email protected]>
Date:   Wed Jun 5 23:29:54 2024 +0000

    Automatic Changelog (new-frontiers-14#1316)

commit c89fbf7
Author: Dvir <[email protected]>
Date:   Thu Jun 6 02:29:28 2024 +0300

    The Bird, the Vulp and the Un-Cloneable (new-frontiers-14#1316)

    * Vision filter accessibility option (new-frontiers-14#889)

    * Add option to disable vision filters

    * Remove DefaultVision in favor of the setting

    * Clean DeltaTab.xaml.cs

    * Fixing Vulps

    * Unclonable

    * Species vision fixes (new-frontiers-14#1150)

    Species vision fixes: no losing vision on nearby species vision haver getting gibbed, fix construction overlay

    * Update DCCVars.cs

    * Update OptionsMenu.xaml.cs

    * DeltaV

    * update

    * Update vulpkanin.yml

    ---------

    Co-authored-by: Debug <[email protected]>
    Co-authored-by: no <[email protected]>

commit 517a3d0
Author: FrontierATC <[email protected]>
Date:   Wed Jun 5 23:27:46 2024 +0000

    Automatic Changelog (new-frontiers-14#1391)

commit 8c93948
Author: VividPups <[email protected]>
Date:   Wed Jun 5 18:27:21 2024 -0500

    Mosin Rework  (new-frontiers-14#1391)

    * Testing?

    Mosin rework

    * Update snipers.yml

    * Update 2

    * update 3

    * Update snipers.yml

    * Update snipers.yml

    * Dumb updates

    updates do be dumb sometimes

    * WOULD THIS WORK?

    FUCK FUCK FU

commit 652b8e9
Author: Checkraze <[email protected]>
Date:   Wed Jun 5 19:23:48 2024 -0400

    Mini Auth (new-frontiers-14#1465)

    * initial commit

    * IOC

    * no lists in toml

    * maybe

    * hm

    * dependent

    * undo

    * no tolerance

    * maybe no instantiate

    * double

    * maybe strings

    * patch

    * proper string handling

    * go back

    * redo

    * lets try this way eh

    * auth cmon

    * test logging

    * whoops

    * our own record

    * put it inside the if

    * eh

    * the worlds a stage

    * or not

    * hu

    * cleanup

    * rearrange the try catch to include the initial connection call as well

    * shorten it up try to simplify

    * no jack

    * locale

commit 1622c31
Merge: c1b0601 41055f2
Author: GreaseMonk <[email protected]>
Date:   Thu Jun 6 00:54:00 2024 +0200

    Merge pull request new-frontiers-14#1471 from dvir001/2024-06-05-FixIssues

    Argenti And Ammo Fixup

commit 41055f2
Author: Dvir <[email protected]>
Date:   Thu Jun 6 00:44:13 2024 +0300

    Update pistol.yml

commit fe167fa
Author: Dvir <[email protected]>
Date:   Wed Jun 5 01:35:06 2024 +0300

    Fixing

commit 2707d95
Author: Dvir <[email protected]>
Date:   Tue May 28 23:21:46 2024 +0300

    Update HTNSystem.cs

commit 1ba8f1e
Author: Dvir <[email protected]>
Date:   Tue May 28 23:20:56 2024 +0300

    Update HTNSystem.cs

commit 18e6a82
Author: Dvir <[email protected]>
Date:   Tue May 28 01:24:11 2024 +0300

    Update HTNSystem.cs

    https://github.com/FireNameFN/corvax-frontier-14/commits/bd773f58ceb5569c652a56077ad4ea8ea25b01a7/Content.Server/NPC/HTN/HTNSystem.cs
@MagnusCrowe MagnusCrowe deleted the hardsuit branch December 1, 2024 20:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dvir001 dvir001 dvir001 approved these changes

@Cheackraze Cheackraze Awaiting requested review from Cheackraze

Assignees
No one assigned
Labels
No C# Sprites Status: Needs Review This PR is awaiting reviews YML
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@MagnusCrowe @dvir001