02/27/2024 pr #1174
Closed
02/27/2024 pr #1174
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
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
Added the NFSD Experimental hardsuit, equivalent to the "Blukie" SR-122 suit. Added NFSD branded doors.
NFSD suit and wall storage containers updated to add the new hardsuits.
Hopefully no bug for hud
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
S: Merge Conflict
|
RSI Diff Bot; head commit e636147 merging into 8aa82a4 Resources/Textures/Interface/Misc/job_icons.rsi
Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_backpack.rsi
Resources/Textures/_NF/Clothing/Back/Backpacks/nfsd_brigmed_backpack.rsi
Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_brigmed_duffle.rsi
Resources/Textures/_NF/Clothing/Back/Duffels/nfsd_duffle.rsi
Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_brigmed_satchel.rsi
Resources/Textures/_NF/Clothing/Back/Satchels/nfsd_satchel.rsi
Resources/Textures/_NF/Clothing/Belt/nfsd_belt.rsi
Resources/Textures/_NF/Clothing/Belt/nfsd_webbing.rsi
Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_e_brown.rsi
Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_e_cb.rsi
Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_e_green.rsi
Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_h_brown.rsi
Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_h_cb.rsi
Resources/Textures/_NF/Clothing/Ears/Headsets/nfsd_h_green.rsi
Resources/Textures/_NF/Clothing/Eyes/Glasses/nfsd_glasses.rsi
Resources/Textures/_NF/Clothing/Eyes/Hud/nfsd_hud.rsi
Resources/Textures/_NF/Clothing/Hands/Gloves/nfsd_brown.rsi
Resources/Textures/_NF/Clothing/Hands/Gloves/nfsd_cream.rsi
Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi
Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_helm.rsi
Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_sheriff_helm.rsi
Resources/Textures/_NF/Clothing/Head/Hats/nfsd_beret_brown.rsi
Resources/Textures/_NF/Clothing/Head/Hats/nfsd_beret_cream.rsi
Resources/Textures/_NF/Clothing/Head/Hats/nfsd_beret_green.rsi
Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign.rsi
Resources/Textures/_NF/Clothing/Head/Hats/nfsd_campaign_small.rsi
Resources/Textures/_NF/Clothing/Neck/Cloaks/nfsdsheriff.rsi
Resources/Textures/_NF/Clothing/Neck/Mantles/nfsdsheriff.rsi
Resources/Textures/_NF/Clothing/Neck/Scarfs/nfsd_bronze_badge.rsi
Resources/Textures/_NF/Clothing/Neck/Scarfs/nfsd_gold_badge.rsi
Resources/Textures/_NF/Clothing/Neck/Scarfs/nfsd_silver_badge.rsi
Resources/Textures/_NF/Clothing/Neck/Scarfs/nfsd_star_badge.rsi
Resources/Textures/_NF/Clothing/OuterClothing/Armor/nfsd_armor.rsi
Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_brigmed.rsi
Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_bronze.rsi
Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi
Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_gold.rsi
Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_sheriff.rsi
Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_silver.rsi
Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_bomber.rsi
Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_brigmed_bomber.rsi
Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_formal.rsi
Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_long.rsi
Resources/Textures/_NF/Clothing/OuterClothing/Misc/nfsd_sheriff_formal.rsi
Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-nfsd.rsi
|
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
the
S: Merge Conflict
dvir001
pushed a commit
to dvir001/frontier-station-14
that referenced
this pull request
Jul 10, 2024
* DeltaV species guidebook entries Copied straight from the wiki :D * Forgor * Update Oni.xml Signed-off-by: Null <[email protected]> --------- Signed-off-by: Null <[email protected]>
whatston3
added a commit
that referenced
this pull request
Jul 11, 2024
* The Tiger * Adds Vulpkanin to the heterochromic eyes marking whitelist (#1434) Adds Vulpkanin to the heterochromic eyes marking whitelist + ups limit to 3 * Remove Vulpkanin overlay restrictions (#1200) no longer must you choose two only * DeltaV species guidebook entries (#1174) * DeltaV species guidebook entries Copied straight from the wiki :D * Forgor * Update Oni.xml Signed-off-by: Null <[email protected]> --------- Signed-off-by: Null <[email protected]> * Lies * Alternative wagging tail for felinids. (#593) * Alternative wagging tail for felinids. More options for felinids. Ported from TG station. * Deletes that one line that appeard for some reason. --------- Signed-off-by: Adrian16199 <[email protected]> * Buffed Harpy (#1217) Now Harpy can mimic more instruments! Signed-off-by: DefinitelyNotFurryXD <[email protected]> * Harpy Can Now Mimic Harps! (#1252) It is weird this isn't already a thing, lol. Signed-off-by: TheOneWhoIsManyFrame <[email protected]> * New horns for oni. (#1030) * New horns for oni. * Update meta.json * That one cursed lack of space * Do what was requested * Update meta.json --------- Co-authored-by: Velcroboy <[email protected]> * ftl real * Unreal * Update Dwarf.xml * Update tattoos.yml * Update Species.xml * Update Species.xml * Missing oni and felinid fluent entries * Fix missing goblin marking fluent entries * Fix incorrect goblin marking entries --------- Signed-off-by: Null <[email protected]> Signed-off-by: Adrian16199 <[email protected]> Signed-off-by: DefinitelyNotFurryXD <[email protected]> Signed-off-by: TheOneWhoIsManyFrame <[email protected]> Co-authored-by: Adrian16199 <[email protected]> Co-authored-by: Adeinitas <[email protected]> Co-authored-by: Tad "Taddy" Johnson <[email protected]> Co-authored-by: Null <[email protected]> Co-authored-by: DefinitelyNotFurryXD <[email protected]> Co-authored-by: TheOneWhoIsManyFrame <[email protected]> Co-authored-by: Velcroboy <[email protected]> Co-authored-by: Whatstone <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the PR
Why / Balance
Technical details
Media
Breaking changes
Changelog