NFSD Resprite #1064

Salvantrix · 2024-02-27T21:16:56Z

About the PR

NFSD Respirtes, revamped all aspect of NFSD and how they're lookin'.

Still a WIP, only thinG left to add is the on-spawn loadouts.

Why / Balance

Technical details

Mostly completed, just need to finish updating spawn-in loadouts.

Media

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

Breaking changes

Changelog

github-actions · 2024-02-27T21:17:32Z

RSI Diff Bot; head commit 70e5021 merging into 9504e7e
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_backpack.rsi

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

Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brigmed_backpack.rsi

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

Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brigmed_duffle.rsi

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

Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_duffle.rsi

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

Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brigmed_satchel.rsi

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

Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_satchel.rsi

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

Resources/Textures/_NF/Clothing/Belt/nfsd_belt.rsi

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

Resources/Textures/_NF/Clothing/Belt/nfsd_webbing.rsi

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

Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_e_brown.rsi

State	Old	New	Status
equipped-EARS			Added
icon			Added
icon_alt			Added

Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_e_cb.rsi

State	Old	New	Status
equipped-EARS			Added
icon			Added
icon_alt			Added

Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_e_green.rsi

State	Old	New	Status
equipped-EARS			Added
icon			Added
icon_alt			Added

Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_h_brown.rsi

State	Old	New	Status
alt-equipped-EARS			Added
icon_alt			Added

Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_h_cb.rsi

State	Old	New	Status
alt-equipped-EARS			Added
icon_alt			Added

Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_h_green.rsi

State	Old	New	Status
alt-equipped-EARS			Added
icon_alt			Added

Resources/Textures/_NF/Clothing/Eyes/Glasses/nfsd_glasses.rsi

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

Resources/Textures/_NF/Clothing/Eyes/Hud/nfsd_hud.rsi

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

Resources/Textures/_NF/Clothing/Hands/Gloves/nfsd_brown.rsi

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

Resources/Textures/_NF/Clothing/Hands/Gloves/nfsd_cream.rsi

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

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

State	Old	New	Status
icon-flash			Added
icon			Added
off-equipped-HELMET-lizard			Added
off-equipped-HELMET-vulpkanin			Added
off-equipped-HELMET			Added
off-inhand-left			Added
off-inhand-right			Added
on-equipped-HELMET-lizard			Added
on-equipped-HELMET-vulpkanin			Added
on-equipped-HELMET			Added
on-inhand-left			Added
on-inhand-right			Added

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

State	Old	New	Status
icon-flash			Added
icon			Added
off-equipped-HELMET-lizard			Added
off-equipped-HELMET-vulpkanin			Added
off-equipped-HELMET			Added
off-inhand-left			Added
off-inhand-right			Added
on-equipped-HELMET-lizard			Added
on-equipped-HELMET-vulpkanin			Added
on-equipped-HELMET			Added
on-inhand-left			Added
on-inhand-right			Added

Resources/Textures/_NF/Clothing/Head/Hats/nfsd_beret_brown.rsi

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

Resources/Textures/_NF/Clothing/Head/Hats/nfsd_beret_cream.rsi

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

Resources/Textures/_NF/Clothing/Head/Hats/nfsd_beret_green.rsi

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

Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign.rsi

State	Old	New	Status
equipped-HELMET-vulpkanin			Added
equipped-HELMET			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign_small.rsi

State	Old	New	Status
equipped-HELMET-vulpkanin			Added
equipped-HELMET			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/_NF/Clothing/Neck/Cloaks/nfsdsheriff.rsi

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

Resources/Textures/_NF/Clothing/Neck/Mantles/nfsdsheriff.rsi

State	Old	New	Status
equipped-NECK			Added
icon			Added

Resources/Textures/_NF/Clothing/Neck/Scarfs/nfsd_bronze_badge.rsi

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

Resources/Textures/_NF/Clothing/Neck/Scarfs/nfsd_gold_badge.rsi

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

Resources/Textures/_NF/Clothing/Neck/Scarfs/nfsd_silver_badge.rsi

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

Resources/Textures/_NF/Clothing/Neck/Scarfs/nfsd_star_badge.rsi

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

Resources/Textures/_NF/Clothing/OuterClothing/Armor/nfsd_armor.rsi

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

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

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

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

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

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

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

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

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

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

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

Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_bomber.rsi

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

Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_brigmed_bomber.rsi

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

Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_formal.rsi

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

Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_long.rsi

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

Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_sheriff_formal.rsi

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

Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-nfsd.rsi

State	Old	New	Status
equipped-FEET			Added
icon-on			Added
icon			Added
inhand-left			Added
inhand-right			Added
on-equipped-FEET			Added
on-inhand-left			Added
on-inhand-right			Added

Resources/Textures/_NF/Clothing/Shoes/Boots/nfsd_brown_boots.rsi

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

Resources/Textures/_NF/Clothing/Shoes/Boots/nfsd_cream_boots.rsi

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

Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt.rsi

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

Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt_short.rsi

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

Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump.rsi

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

Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_jump_short.rsi

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

Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_black.rsi

State	Old	New	Status
equipped-INNERCLOTHING			Added

Edit: diff updated after 70e5021

MagnusCrowe · 2024-02-27T22:36:49Z

The blue looks too dark and too saturated.

CautionDev · 2024-02-27T23:03:35Z

Kesiath · 2024-02-28T02:03:21Z

I think the green would be a better option, as long as it's desaturated enough to not be mistaken with CentCom attire.

Blue has been thrown out, green updates for everything!

GREEN.

Bingus.

Updated ID's to have actual ID's, Deleted the ID component for badges and they are now vanity scarf items, updated all NFSD starting loadouts, and completed filled variants of all bag items.

github-actions · 2024-03-04T22:07:15Z

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

Finishing touches made on NFSD sprites. Ready for review of my spaghet yml.

Added Sheriff Mantle/Cloak. PR is completed at this stage.

Cheackraze · 2024-03-11T23:14:59Z

I wanna bundle this in with the space law changes + server rules changes, etc, and these all look great to me so as soon as conflicts are finished we can merge this.

Cheackraze · 2024-03-12T00:54:25Z

ok something funky is going on with git merge so im going to have to come back to this later this week, sorry about that

…27/2024-PR

…27/2024-PR # Conflicts: # Resources/Prototypes/_NF/Roles/Jobs/NFSD/detective.yml

Cheackraze · 2024-03-14T22:27:38Z

ok I think I fixed it, just ignore the 8 or so commits i had to push hah

ThatOneGoblin25 · 2024-03-18T14:03:35Z

Will this resprite also include airlocks, vendors and nfsd computers?
Or maybe not because then we'll have to redecal every ship...

github-actions · 2024-03-18T16:47:16Z

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

# Conflicts: # Resources/Prototypes/_NF/Entities/Clothing/Back/backpacks.yml # Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets.yml # Resources/Prototypes/_NF/Entities/Clothing/Eyes/hud.yml # Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml # Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml # Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml # Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml # Resources/Textures/_NF/Objects/Misc/id_cards.rsi/meta.json

…ever understand.

github-actions · 2024-03-29T23:12:56Z

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

NFSD Resprite

44fbb3f

github-actions bot added No C# Sprites YML labels Feb 27, 2024

dvir001 marked this pull request as draft February 27, 2024 21:18

Updated License and Copyright sections.

aa66c34

Salvantrix marked this pull request as ready for review February 27, 2024 22:12

dvir001 and others added 7 commits February 28, 2024 21:28

ID

3685288

Filled

1c047e3

NFSD Resprite

63f45ca

Blue has been thrown out, green updates for everything!

NFSD ITS GREEN NOW

593c1d6

GREEN.

Brigmed green

9801732

Bingus.

Yeah..

375c120

03/04/2024

52af6a6

Updated ID's to have actual ID's, Deleted the ID component for badges and they are now vanity scarf items, updated all NFSD starting loadouts, and completed filled variants of all bag items.

github-actions bot added the Merge Conflict This PR has conflicts that prevent merging label Mar 4, 2024

Salvantrix added 2 commits March 5, 2024 19:41

03/05/2024

e2222c7

Finishing touches made on NFSD sprites. Ready for review of my spaghet yml.

03/06/2024

161a980

Added Sheriff Mantle/Cloak. PR is completed at this stage.

Cheackraze approved these changes Mar 11, 2024

View reviewed changes

fix conflicts

6610951

github-actions bot removed the Merge Conflict This PR has conflicts that prevent merging label Mar 12, 2024

Cheackraze added 3 commits March 14, 2024 17:42

fix conflicts

73c8fe6

Merge remote-tracking branch 'Salvantrix/02/27/2024-PR' into fork/02/…

90709ee

…27/2024-PR

fix RobustToolbox

8528b05

Cheackraze added 8 commits March 14, 2024 17:49

fix robust

432cf9f

Merge branch 'master' into fork/02/27/2024-PR

fc806d1

fix it already

17e316f

fix

994780c

try again

f18cd7a

Merge remote-tracking branch 'Salvantrix/02/27/2024-PR' into fork/02/…

80008ba

…27/2024-PR # Conflicts: # Resources/Prototypes/_NF/Roles/Jobs/NFSD/detective.yml

remove robust

52788d9

re add robust

0319259

github-actions bot added the Merge Conflict This PR has conflicts that prevent merging label Mar 18, 2024

github-actions bot removed the Merge Conflict This PR has conflicts that prevent merging label Mar 29, 2024

Cheackraze added 5 commits March 29, 2024 18:41

rename Icon to icon

fd6c276

id fix

9af4d67

rename initial

dc0f1d4

rename

b37cf60

fix the icon finally. why does git handle renaming so poorly i will n…

56238ac

…ever understand.

github-actions bot added the Merge Conflict This PR has conflicts that prevent merging label Mar 29, 2024

Cheackraze added 2 commits March 29, 2024 19:17

Merge branch 'master' into fork/02/27/2024-PR

4e8d5d8

mantle - Mantle

34a537d

github-actions bot removed the Merge Conflict This PR has conflicts that prevent merging label Mar 29, 2024

detective ranking change

70e5021

Cheackraze merged commit 7f608c4 into new-frontiers-14:master Mar 29, 2024
13 checks passed

ThatOneGoblin25 mentioned this pull request Apr 18, 2024

[Mega-issue] List of NFSD ships for resprite #1230

Closed

14 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

NFSD Resprite #1064

NFSD Resprite #1064

Salvantrix commented Feb 27, 2024 •

edited

Loading

github-actions bot commented Feb 27, 2024 •

edited

Loading

MagnusCrowe commented Feb 27, 2024

CautionDev commented Feb 27, 2024

Kesiath commented Feb 28, 2024

github-actions bot commented Mar 4, 2024

Cheackraze commented Mar 11, 2024

Cheackraze commented Mar 12, 2024

Cheackraze commented Mar 14, 2024

ThatOneGoblin25 commented Mar 18, 2024

github-actions bot commented Mar 18, 2024

github-actions bot commented Mar 29, 2024

NFSD Resprite #1064

NFSD Resprite #1064

Conversation

Salvantrix commented Feb 27, 2024 • edited Loading

About the PR

Why / Balance

Technical details

Media

Breaking changes

github-actions bot commented Feb 27, 2024 • edited Loading

MagnusCrowe commented Feb 27, 2024

CautionDev commented Feb 27, 2024

Kesiath commented Feb 28, 2024

github-actions bot commented Mar 4, 2024

Cheackraze commented Mar 11, 2024

Cheackraze commented Mar 12, 2024

Cheackraze commented Mar 14, 2024

ThatOneGoblin25 commented Mar 18, 2024

github-actions bot commented Mar 18, 2024

github-actions bot commented Mar 29, 2024

Salvantrix commented Feb 27, 2024 •

edited

Loading

github-actions bot commented Feb 27, 2024 •

edited

Loading