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

Nyano Guns & Melees #19

Merged
merged 7 commits into from
Sep 15, 2023
Merged

Conversation

FluffiestFloof
Copy link
Contributor

@FluffiestFloof FluffiestFloof commented Sep 15, 2023

Note this is only the stuff from Nyano, not DeltaV

About the PR

This adds the mk32 universal and ammo/magazines, the mark1 rifle, ceremonial rifle, kanabou, shinai, breaching hammer, dulled katana, dulled claymore, anti psychic knife, wakizashi.

Why / Balance

Technical details

MeleeBloodletter, AntiPsionicWeapon and MeleeStaminaCost components had to be commented out.
The bolt-open for the mk32 is a placeholder.
The ForensicBeltEquip tag is commented out from the anti psychic knife.

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 github-actions bot added Changes: Sprites Changes: YML Changes any yml files labels Sep 15, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Sep 15, 2023

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

Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi

State Old New Status
base Added
high_velocity Added
mag-1 Added
mag-10 Added
mag-11 Added
mag-2 Added
mag-3 Added
mag-4 Added
mag-5 Added
mag-6 Added
mag-7 Added
mag-8 Added
mag-9 Added
practice Added
red-icon Added
red Added
rubber Added

Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi

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

Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Snipers/ceremonial_grand.rsi

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

Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Snipers/grand_rifle.rsi

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

Resources/Textures/Nyanotrasen/Objects/Weapons/Melee/anti_psychic_knife.rsi

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

Resources/Textures/Nyanotrasen/Objects/Weapons/Melee/breaching_hammer.rsi

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

Resources/Textures/Nyanotrasen/Objects/Weapons/Melee/kanabou.rsi

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

Resources/Textures/Nyanotrasen/Objects/Weapons/Melee/shinai.rsi

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

Resources/Textures/Nyanotrasen/Objects/Weapons/Melee/wakizashi.rsi

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

Resources/Textures/Nyanotrasen/Objects/Weapons/Melee/white_cane.rsi

State Old New Status
icon Added
inhand-left Added
inhand-right Added
wielded-inhand-left Added
wielded-inhand-right Added

Edit: diff updated after 3dbc546

FluffiestFloof and others added 2 commits September 15, 2023 20:18
Woops I'm extremely not smart
Commented out error-causing detail

Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
@Colin-Tel
Copy link
Contributor

Committed a change to comment out the "autoCycle" thing causing errors, like I did with DeltaV's Adjutant shotgun.

@Colin-Tel Colin-Tel merged commit 8067aec into DeltaV-Station:master Sep 15, 2023
14 checks passed
@FluffiestFloof FluffiestFloof deleted the weapons branch September 15, 2023 22:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants