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

Nikko Loadout Changes (+ Extras) #390

Merged
merged 21 commits into from
Dec 2, 2024
Merged

Conversation

Memeji
Copy link
Collaborator

@Memeji Memeji commented Dec 2, 2024

Description

Added a few items to the loadouts.
Added some contraband to maintenance lockers for security to have something to do.
More end-round sounds.


To-Do

  • Fix Bartender loadouts

Changelog

🆑

  • add: Repeater, Argenti, and 45 magnum rubber box to Bartender's loadout.
  • add: Red cloak to loadout
  • add: Witch Robes to loadout
  • add: Sawed-off PKA
  • add: More end-round sounds.
  • add: Some contraband to the maintenance lockers.
  • tweak: Salvage Restock crate price raised to 1300

@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: Audio Changes any ogg files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files and removed Status: Needs Review Someone please review this labels Dec 2, 2024
@Memeji Memeji self-assigned this Dec 2, 2024
@Floof-Station-Bot Floof-Station-Bot changed the title Nikko Loadout changes (+ extras) Nikko Loadout Changes (+ Extras) Dec 2, 2024
Copy link
Contributor

github-actions bot commented Dec 2, 2024

RSI Diff Bot; head commit 8c17a7e merging into 54538a5
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Floof/Clothing/Head/Hoods/redhood.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi

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

Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi

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

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

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

Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi

State Old New Status
base-1 Added
base-2 Added
base-3 Added
base-4 Added
base-5 Added
base-6 Added
base-7 Added
base-8 Added
base Added
icon Added
piercing-1 Added
piercing-2 Added
piercing-3 Added
piercing-4 Added
piercing-5 Added
piercing-6 Added
piercing-7 Added
piercing-8 Added
piercing-icon Added
practice-1 Added
practice-2 Added
practice-3 Added
practice-4 Added
practice-5 Added
practice-6 Added
practice-7 Added
practice-8 Added
practice-icon Added
rubber-1 Added
rubber-2 Added
rubber-3 Added
rubber-4 Added
rubber-5 Added
rubber-6 Added
rubber-7 Added
rubber-8 Added
rubber-icon Added
uranium-1 Added
uranium-2 Added
uranium-3 Added
uranium-4 Added
uranium-5 Added
uranium-6 Added
uranium-7 Added
uranium-8 Added
uranium-icon Added

Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi

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

Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi

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

Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi

State Old New Status
base Added
bolt-open Added
equipped-BACKPACK Added
equipped-SUITSTORAGE Added
inhand-left Added
inhand-right Added
wielded-inhand-left Added
wielded-inhand-right Added

Edit: diff updated after 8c17a7e

@FoxxoTrystan FoxxoTrystan self-assigned this Dec 2, 2024
@Memeji Memeji requested a review from FoxxoTrystan December 2, 2024 22:36
@FoxxoTrystan FoxxoTrystan merged commit 01c82b1 into Fansana:master Dec 2, 2024
14 checks passed
Floof-Station-Bot added a commit that referenced this pull request Dec 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Audio Changes any ogg files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants