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

Misc Resprites. #664

Merged
merged 3 commits into from
Dec 10, 2023
Merged

Conversation

FoxxoTrystan
Copy link
Contributor

@FoxxoTrystan FoxxoTrystan commented Dec 6, 2023

About the PR

Updated some sprties:
• Armor
• Slim Armor
• Riot Amor
• Bulletproof Amor
• Stunbaton
• Fire Extinguisher
• Double Barrel Shotgun
• Nuclear Device
• Sawn Off
• Sniper Rifle Back Sprite
• Walls/Windows does not mend with airlocks/shutters

  • Flags
  • Welded Scrubber Vent

Why / Balance

Update sprties as they are extremly old and some fixes.

Technical details

.yml changes and sprties changes.

Media

Breaking changes

Changelog

🆑 FoxxoTrystan

  • tweak: Misc Sprites Changes.

Copy link
Contributor

github-actions bot commented Dec 6, 2023

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

Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified

Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified

Resources/Textures/Clothing/OuterClothing/Armor/security.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified

Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified

Resources/Textures/Objects/Devices/nuke.rsi

State Old New Status
nuclearbomb_base Modified
nuclearbomb_exploding Modified
nuclearbomb_safetyoff Modified
nuclearbomb_timing Modified

Resources/Textures/Objects/Misc/fire_extinguisher.rsi

State Old New Status
fire_extinguisher_closed Modified
fire_extinguisher_open Modified

Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi

State Old New Status
bolt-open Modified
equipped-BACKPACK Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi

State Old New Status
bolt-open Modified
icon Modified

Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi

State Old New Status
equipped-BACKPACK Modified

Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi

State Old New Status
stunbaton_nocell Modified
stunbaton_off Modified
stunbaton_on Modified

Resources/Textures/Structures/Decoration/banner.rsi

State Old New Status
banner Modified
banner_cargo Modified
banner_engineering Modified
banner_medical Modified
banner_science Modified
banner_security Modified
banner_syndicate Modified

Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi

State Old New Status
scrub_welded Modified

Edit: diff updated after c39cf8c

@dvir001
Copy link
Contributor

dvir001 commented Dec 7, 2023

bolt-open shotgun missing?
I dont think its used right now but why have it be a copy paste?

@FoxxoTrystan
Copy link
Contributor Author

bolt-open shotgun missing? I dont think its used right now but why have it be a copy paste?

Its is unused, but i dont wana delete the file just in case upstream as a secret file that uses it and then fucks everything.
(i dont like destroying upstream files)

Tho pretty sure we can remove it, just left it there in case.

@Cheackraze Cheackraze self-requested a review December 10, 2023 18:27
@github-actions github-actions bot added the Status: Needs Review This PR is awaiting reviews label Dec 10, 2023
@Cheackraze Cheackraze merged commit 1ed7a13 into new-frontiers-14:master Dec 10, 2023
11 of 12 checks passed
FrontierATC added a commit that referenced this pull request Dec 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Status: Needs Review This PR is awaiting reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants