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

Experimental NFSD suit, NFSD Doors, and wall/suit storage containers. #1176

Closed
wants to merge 53 commits into from

Conversation

Salvantrix
Copy link
Contributor

About the PR

Adds Experimental NFSD hardsuit, Wall and Suit storage containers, and fixes a small error in description.

Why / Balance

Added stuff.

Technical details

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

Salvantrix and others added 30 commits February 27, 2024 16:16
Blue has been thrown out, green updates for everything!
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.
Finishing touches made on NFSD sprites. Ready for review of my spaghet yml.
Added Sheriff Mantle/Cloak.

PR is completed at this stage.
…27/2024-PR

# Conflicts:
#	Resources/Prototypes/_NF/Roles/Jobs/NFSD/detective.yml
# 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
Copy link
Contributor

github-actions bot commented Mar 30, 2024

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

Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi

State Old New Status
Chaplain Added
MedicalBorg Added
nyanoGladiator Added
nyanoMantis Added
nyanoMartialArtist Added
nyanoPrisonGuard Added

Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.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/OuterClothing/Hardsuits/nfsd_experimental.rsi

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

Resources/Textures/_NF/Interface/Misc/job_icons.rsi

State Old New Status
spacetrafficcontrol Added
stationguard Added

Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi

State Old New Status
assembly Added
bolted_unlit Added
closed Added
closed_unlit Added
closing Added
closing_unlit Added
deny_unlit Added
emergency_unlit Added
open Added
opening Added
opening_unlit Added
panel_closing Added
panel_open Added
panel_opening Added
sparks Added
sparks_broken Added
sparks_damaged Added
sparks_open Added
welded Added

Edit: diff updated after f489cbf

@Salvantrix Salvantrix changed the title 03/30/2024 03/30/2024 - Experimental NFSD suit, NFSD Doors, and wall/suit storage containers. Mar 30, 2024
@dvir001 dvir001 changed the title 03/30/2024 - Experimental NFSD suit, NFSD Doors, and wall/suit storage containers. Experimental NFSD suit, NFSD Doors, and wall/suit storage containers. Mar 30, 2024
@VividPups
Copy link
Contributor

VividPups commented Mar 30, 2024

You have an Error with something about the Meta.json file

@dvir001
Copy link
Contributor

dvir001 commented Mar 31, 2024

@Salvantrix Just fix the jobs icon: please

@dvir001
Copy link
Contributor

dvir001 commented Mar 31, 2024

Ill fix the rest of the issues later reee

@MagnusCrowe
Copy link
Contributor

Fixed the issue with the lobby screen and icons.

@Salvantrix Salvantrix closed this Apr 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants