Skip to content

Commit

Permalink
Misc Resprites! (Simple-Station#435)
Browse files Browse the repository at this point in the history
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

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

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->

- [x] Port/Resprites.

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>


![image](https://github.com/Simple-Station/Einstein-Engines/assets/45297731/3ad4521e-093c-4e3a-a088-6e61e8e66a49)

</p>
</details>

---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- 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!
  • Loading branch information
FoxxoTrystan committed Jun 11, 2024
1 parent 9a79f00 commit 87850a7
Show file tree
Hide file tree
Showing 89 changed files with 34 additions and 42 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken/modified by Taral from tgstation at commit https://github.com/tgstation/tgstation/commit/dbc2435fa562f4ef130a7112d2a4cc9c80099894",
"copyright": "Taken from https://github.com/ParadiseSS13/Paradise",
"size": {
"x": 32,
"y": 32
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/fed2ddeb54d0fb8bb97cb0a899a088b7d7423bbb",
"copyright": "Taken from https://github.com/ParadiseSS13/Paradise",
"size": {
"x": 32,
"y": 32
Expand All @@ -23,4 +23,4 @@
"directions": 4
}
]
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"copyright": "Taken from https://github.com/ParadiseSS13/Paradise",
"size": {
"x": 32,
"y": 32
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae",
"copyright": "Taken from https://github.com/ParadiseSS13/Paradise",
"size": {
"x": 32,
"y": 32
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/tgstation/tgstation at commit 9bebd81ae0b0a7f952b59886a765c681205de31f",
"copyright": "Taken from https://github.com/ParadiseSS13/Paradise // Hand Sprites taken from https://github.com/tgstation/tgstation at commit 9bebd81ae0b0a7f952b59886a765c681205de31f",
"size": {
"x": 32,
"y": 32
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Misc/stock_parts.rsi/femto_mani.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
50 changes: 21 additions & 29 deletions Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0, micro_mani by EmoGarbage404 (github)",
"copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0 // Taken from https://github.com/ParadiseSS13/Paradise/",
"states": [
{
"name": "adv_capacitor"
Expand All @@ -27,6 +27,7 @@
0.1,
0.1,
0.1,
0.1,
0.1
]
]
Expand All @@ -53,7 +54,13 @@
"name": "bluespace_matter_bin",
"delays": [
[
0.3,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
Expand Down Expand Up @@ -146,15 +153,7 @@
]
},
{
"name": "femto_mani",
"delays": [
[
0.3,
0.1,
0.1,
0.1
]
]
"name": "femto_mani"
},
{
"name": "hdd1"
Expand Down Expand Up @@ -184,24 +183,10 @@
"name": "pico_mani"
},
{
"name": "quadratic_capacitor",
"delays": [
[
0.3,
0.1,
0.1,
0.1
]
]
"name": "quadratic_capacitor"
},
{
"name": "quadultra_micro_laser",
"delays": [
[
0.1,
0.1
]
]
"name": "quadultra_micro_laser"
},
{
"name": "rom1"
Expand All @@ -222,7 +207,6 @@
0.1,
0.1,
0.1,
0.1,
0.1
]
]
Expand Down Expand Up @@ -260,7 +244,15 @@
"name": "super_matter_bin"
},
{
"name": "super_scan_module"
"name": "super_scan_module",
"delays": [
[
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "treatment_disk"
Expand Down
Binary file modified Resources/Textures/Objects/Misc/stock_parts.rsi/micro_laser.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Misc/stock_parts.rsi/nano_mani.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Misc/stock_parts.rsi/pico_mani.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Misc/stock_parts.rsi/scan_module.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d",
"copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ // Hands sprites taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d",
"size": {
"x": 32,
"y": 32
Expand Down
Binary file modified Resources/Textures/Structures/Decoration/banner.rsi/banner.png
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/tgstation/tgstation/commit/fa9e44d937026d5a2ba72615afccf2f18a87c485 | banner_syndicate sprited by mureixlol (Discord)",
"copyright": "Taken from https://github.com/ParadiseSS13/Paradise // banner_revolution, banner-red, banner-blue, banner-yellow, banner-green Taken from https://github.com/tgstation/tgstation/commit/fa9e44d937026d5a2ba72615afccf2f18a87c485",
"size": {
"x": 32,
"y": 32
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d5cb4288ec5f7cb9fb5b6f6e798f4c64cd82cd09, Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/9d7ff729b6b89eee0b3d750327f9fbaff4aeb045",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d5cb4288ec5f7cb9fb5b6f6e798f4c64cd82cd09, Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/9d7ff729b6b89eee0b3d750327f9fbaff4aeb045, Taken from https://github.com/ParadiseSS13/Paradise",
"size": {
"x": 32,
"y": 32
Expand Down Expand Up @@ -29,4 +29,4 @@
"name": "dresser"
}
]
}
}
Binary file modified Resources/Textures/Structures/Furniture/furniture.rsi/rack.png
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from goonstation at https://github.com/goonstation/goonstation/commit/cbe076402ed43b1cd861295bbcb95608c453de7a. Edited by chromiumboy",
"copyright": "Taken from https://github.com/ParadiseSS13/Paradise/. Edited by FoxxoTrystan",
"size": {
"x": 32,
"y": 32
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "From vgstation: https://github.com/vgstation-coders/vgstation13/commit/a7290010020e541ed6b57817a07023ca6bef26fe#diff-20395160138bed693d15eee6f16d671531b5fa533ec52c50e8df6d52370dbecd",
"copyright": "Taken from https://github.com/ParadiseSS13/Paradise/",
"size": {
"x": 32,
"y": 32
Expand Down
Binary file modified Resources/Textures/Structures/Wallmounts/screen.rsi/screen.png
Binary file modified Resources/Textures/Structures/Walls/solid_rust.rsi/full.png
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/tgstation/tgstation/commit/67a5373b4649937dd63dd94153e05e8506f40a5d and modified.",
"copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan.",
"size": {
"x": 32,
"y": 32
Expand Down
Binary file modified Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over1.png
Binary file modified Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over3.png
Binary file modified Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over4.png
Binary file modified Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over5.png
Binary file modified Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over6.png
Binary file modified Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over7.png
Binary file modified Resources/Textures/Structures/Walls/solid_rust.rsi/rgeneric.png
Binary file modified Resources/Textures/Structures/Walls/solid_rust.rsi/solid0.png
Binary file modified Resources/Textures/Structures/Walls/solid_rust.rsi/solid1.png
Binary file modified Resources/Textures/Structures/Walls/solid_rust.rsi/solid2.png
Binary file modified Resources/Textures/Structures/Walls/solid_rust.rsi/solid3.png
Binary file modified Resources/Textures/Structures/Walls/solid_rust.rsi/solid4.png
Binary file modified Resources/Textures/Structures/Walls/solid_rust.rsi/solid5.png
Binary file modified Resources/Textures/Structures/Walls/solid_rust.rsi/solid6.png
Binary file modified Resources/Textures/Structures/Walls/solid_rust.rsi/solid7.png

0 comments on commit 87850a7

Please sign in to comment.