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! #435

Merged
merged 4 commits into from
Jun 11, 2024
Merged

Misc Resprites! #435

merged 4 commits into from
Jun 11, 2024

Conversation

FoxxoTrystan
Copy link
Member

@FoxxoTrystan FoxxoTrystan commented Jun 6, 2024

Description

This PR add a bunch of Misc Repsrites and others fixes that i have missed.
This PR will avoid ALL .yml changes and will focus on only "Sprites" changes.

Here is the following list of Changed Sprites:

• Rust Solid/Reinforced Walls
• Stunbaton
• Banners
• Radiation Collector
• Riot Suit
• Bulletproof Vest
• Armor Vest
• Slim Armor Vest
• Fire Extinguisher
• Stock Parts
• Rack
• Screen

TODO

  • Port/Resprites.

Media

image


Changelog

🆑

  • tweak: Rust Walls Sprites.
  • tweak: Armor, Bulletproof, Riot Suit Resprites.
  • tweak: New Banners Sprites.
  • tweak: Stunbaton, Fire Extinguisher New Sprites.
  • tweak: Rack/WallScreen resprites.
  • tweak: Stock Parts new sprites!
  • tweak: Radiation Collector has now a new sprite!

@github-actions github-actions bot added the Changes: Sprite Changes any png or json in an RSI label Jun 6, 2024
Copy link
Contributor

github-actions bot commented Jun 6, 2024

RSI Diff Bot; head commit e85b0eb merging into 310e3ae
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/Misc/fire_extinguisher.rsi

State Old New Status
fire_extinguisher_closed Modified
fire_extinguisher_open Modified

Resources/Textures/Objects/Misc/stock_parts.rsi

State Old New Status
adv_capacitor Modified
adv_scan_module Modified
advanced_matter_bin Modified
bluespace_matter_bin Modified
capacitor Modified
femto_mani Modified
high_micro_laser Modified
matter_bin Modified
micro_laser Modified
micro_mani Modified
nano_mani Modified
pico_mani Modified
quadratic_capacitor Modified
quadultra_micro_laser Modified
scan_module Modified
super_capacitor Modified
super_matter_bin Modified
super_scan_module Modified
triphasic_scan_module Modified
ultra_high_micro_laser 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/Furniture/furniture.rsi

State Old New Status
rack Modified

Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi

State Old New Status
ca-o0 Modified
ca-o1 Modified
ca-o2 Modified
ca-o3 Modified
ca-tank Modified
ca_active Modified
ca_deactive Modified
ca_off Modified
ca_on Modified
cu Modified
static Modified

Resources/Textures/Structures/Wallmounts/screen.rsi

State Old New Status
screen Modified

Resources/Textures/Structures/Walls/solid_rust.rsi

State Old New Status
full Modified
reinf_construct-0 Modified
reinf_construct-1 Modified
reinf_construct-2 Modified
reinf_construct-3 Modified
reinf_construct-4 Modified
reinf_construct-5 Modified
reinf_over0 Modified
reinf_over1 Modified
reinf_over2 Modified
reinf_over3 Modified
reinf_over4 Modified
reinf_over5 Modified
reinf_over6 Modified
reinf_over7 Modified
rgeneric Modified
solid0 Modified
solid1 Modified
solid2 Modified
solid3 Modified
solid4 Modified
solid5 Modified
solid6 Modified
solid7 Modified

Edit: diff updated after e85b0eb

@github-actions github-actions bot added the Status: Needs Review Someone please review this label Jun 6, 2024
@DangerRevolution DangerRevolution added Priority: 3-Medium Needs to be resolved at some point Size: 2-Large For large issues/PRs Status: Needs Discussion Must be discussed Type: Port Brings something to here from another codebase Type: Rework Large changes to a system, like a mix between the Balancing, Codebase, and Respace labels labels Jun 6, 2024
Copy link
Member

@DEATHB4DEFEAT DEATHB4DEFEAT left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add permalinks to every meta.

@FoxxoTrystan
Copy link
Member Author

Add permalinks to every meta.

Missing Permalink and a tiny fix to a meta file has been done.

Copy link
Member

@VMSolidus VMSolidus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These look great! Thank you Trystan!

@VMSolidus VMSolidus merged commit 87850a7 into Simple-Station:master Jun 11, 2024
11 checks passed
SimpleStation14 added a commit that referenced this pull request Jun 11, 2024
VMSolidus pushed a commit to VMSolidus/Einstein-Engines that referenced this pull request Aug 16, 2024
* ling gamemode

* more shit

* gaming

* Update game_presets.yml

* Update secret_weights.yml

* gaming 2

* shittery

* fart

* fart 2

* gorbing

* balance stasis again

* fart

* goobing

* chat is this real?

* real.

* g

* fucking chemical regen i fucking hate it i hate you i hate everythi

* fart

* fart 2

* Add _timing

* fart 3

* fart 5

* fart 6: electrical boogaloo

* balance issue

* fart

* holy shit!!

* gorber

* gorbing time

* init

* fart 10

---------

Co-authored-by: whateverusername0 <whateveremail>
Co-authored-by: Aidenkrz <[email protected]>
Co-authored-by: Fishbait <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprite Changes any png or json in an RSI Priority: 3-Medium Needs to be resolved at some point Size: 2-Large For large issues/PRs Status: Needs Discussion Must be discussed Status: Needs Review Someone please review this Type: Port Brings something to here from another codebase Type: Rework Large changes to a system, like a mix between the Balancing, Codebase, and Respace labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants