-
Notifications
You must be signed in to change notification settings - Fork 29
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'EE-Personal/master' into upstream-merge…
…-6/10/2024
- Loading branch information
Showing
90 changed files
with
52 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
+211 Bytes
(150%)
...extures/Clothing/OuterClothing/Armor/bulletproof.rsi/equipped-OUTERCLOTHING.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
BIN
-8 Bytes
(97%)
Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion
2
Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
-914 Bytes
(41%)
...urces/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING.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
BIN
-62 Bytes
(79%)
Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
+70 Bytes
(120%)
...s/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.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
BIN
-59 Bytes
(77%)
Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion
2
Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
+56 Bytes
(110%)
...tures/Clothing/OuterClothing/Armor/security_slim.rsi/equipped-OUTERCLOTHING.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
BIN
-82 Bytes
(70%)
Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion
2
Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
-126 Bytes
(71%)
Resources/Textures/Objects/Misc/fire_extinguisher.rsi/fire_extinguisher_closed.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
BIN
-105 Bytes
(75%)
Resources/Textures/Objects/Misc/fire_extinguisher.rsi/fire_extinguisher_open.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion
2
Resources/Textures/Objects/Misc/fire_extinguisher.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
-75 Bytes
(82%)
Resources/Textures/Objects/Misc/stock_parts.rsi/adv_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
BIN
-202 Bytes
(78%)
Resources/Textures/Objects/Misc/stock_parts.rsi/adv_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.
Binary file modified
BIN
+4 Bytes
(100%)
Resources/Textures/Objects/Misc/stock_parts.rsi/advanced_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.
Binary file modified
BIN
+656 Bytes
(200%)
Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_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.
Binary file modified
BIN
+137 Bytes
(150%)
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
BIN
-173 Bytes
(71%)
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.
Binary file modified
BIN
+55 Bytes
(120%)
Resources/Textures/Objects/Misc/stock_parts.rsi/high_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
BIN
-5 Bytes
(99%)
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.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
+94 Bytes
(140%)
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
BIN
+24 Bytes
(110%)
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
BIN
+34 Bytes
(110%)
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
BIN
+31 Bytes
(110%)
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.
Binary file modified
BIN
-362 Bytes
(50%)
Resources/Textures/Objects/Misc/stock_parts.rsi/quadratic_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
BIN
+50 Bytes
(110%)
Resources/Textures/Objects/Misc/stock_parts.rsi/quadultra_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
BIN
-13 Bytes
(97%)
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.
Binary file modified
BIN
-128 Bytes
(69%)
Resources/Textures/Objects/Misc/stock_parts.rsi/super_capacitor.png
Oops, something went wrong.
Binary file modified
BIN
+126 Bytes
(130%)
Resources/Textures/Objects/Misc/stock_parts.rsi/super_matter_bin.png
Oops, something went wrong.
Binary file modified
BIN
-618 Bytes
(48%)
Resources/Textures/Objects/Misc/stock_parts.rsi/super_scan_module.png
Oops, something went wrong.
Binary file modified
BIN
+139 Bytes
(120%)
Resources/Textures/Objects/Misc/stock_parts.rsi/triphasic_scan_module.png
Oops, something went wrong.
Binary file modified
BIN
+85 Bytes
(130%)
Resources/Textures/Objects/Misc/stock_parts.rsi/ultra_high_micro_laser.png
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
-178 Bytes
(59%)
Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/stunbaton_nocell.png
Oops, something went wrong.
Binary file modified
BIN
-138 Bytes
(62%)
Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/stunbaton_off.png
Oops, something went wrong.
Binary file modified
BIN
+662 Bytes
(160%)
Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/stunbaton_on.png
Oops, something went wrong.
Binary file modified
BIN
-1.15 KB
(25%)
Resources/Textures/Structures/Decoration/banner.rsi/banner.png
Oops, something went wrong.
Binary file modified
BIN
-104 Bytes
(80%)
Resources/Textures/Structures/Decoration/banner.rsi/banner_cargo.png
Oops, something went wrong.
Binary file modified
BIN
-343 Bytes
(53%)
Resources/Textures/Structures/Decoration/banner.rsi/banner_engineering.png
Oops, something went wrong.
Binary file modified
BIN
-8 Bytes
(98%)
Resources/Textures/Structures/Decoration/banner.rsi/banner_medical.png
Oops, something went wrong.
Binary file modified
BIN
-120 Bytes
(78%)
Resources/Textures/Structures/Decoration/banner.rsi/banner_science.png
Oops, something went wrong.
Binary file modified
BIN
-340 Bytes
(54%)
Resources/Textures/Structures/Decoration/banner.rsi/banner_security.png
Oops, something went wrong.
Binary file modified
BIN
-175 Bytes
(69%)
Resources/Textures/Structures/Decoration/banner.rsi/banner_syndicate.png
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
+65 Bytes
(130%)
Resources/Textures/Structures/Furniture/furniture.rsi/rack.png
Oops, something went wrong.
Binary file modified
BIN
-1.29 KB
(10%)
Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o0.png
Oops, something went wrong.
Binary file modified
BIN
-1.24 KB
(11%)
Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o1.png
Oops, something went wrong.
Binary file modified
BIN
-1.2 KB
(11%)
Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o2.png
Oops, something went wrong.
Binary file modified
BIN
-1.24 KB
(10%)
Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-o3.png
Oops, something went wrong.
Binary file modified
BIN
-1.83 KB
(9.6%)
...rces/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca-tank.png
Oops, something went wrong.
Binary file modified
BIN
-7.41 KB
(29%)
...es/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_active.png
Oops, something went wrong.
Binary file modified
BIN
-7.48 KB
(29%)
.../Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_deactive.png
Oops, something went wrong.
Binary file modified
BIN
-1.72 KB
(36%)
...urces/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_off.png
Oops, something went wrong.
Binary file modified
BIN
-1.65 KB
(47%)
Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_on.png
Oops, something went wrong.
Binary file modified
BIN
+432 Bytes
(180%)
Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/cu.png
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
+944 Bytes
(240%)
...urces/Textures/Structures/Power/Generation/Singularity/collector.rsi/static.png
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
+132 Bytes
(150%)
Resources/Textures/Structures/Wallmounts/screen.rsi/screen.png
Oops, something went wrong.
Binary file modified
BIN
+73 Bytes
(100%)
Resources/Textures/Structures/Walls/solid_rust.rsi/full.png
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
-45 Bytes
(98%)
Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-0.png
Oops, something went wrong.
Binary file modified
BIN
-31 Bytes
(99%)
Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-1.png
Oops, something went wrong.
Binary file modified
BIN
-71 Bytes
(97%)
Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-2.png
Oops, something went wrong.
Binary file modified
BIN
-67 Bytes
(97%)
Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-3.png
Oops, something went wrong.
Binary file modified
BIN
-104 Bytes
(96%)
Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-4.png
Oops, something went wrong.
Binary file modified
BIN
-116 Bytes
(95%)
Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-5.png
Oops, something went wrong.
Binary file modified
BIN
+3 Bytes
(100%)
Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over0.png
Oops, something went wrong.
Binary file modified
BIN
+216 Bytes
(110%)
Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over1.png
Oops, something went wrong.
Binary file modified
BIN
+3 Bytes
(100%)
Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over2.png
Oops, something went wrong.
Binary file modified
BIN
+216 Bytes
(110%)
Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over3.png
Oops, something went wrong.
Binary file modified
BIN
+288 Bytes
(110%)
Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over4.png
Oops, something went wrong.
Binary file modified
BIN
+220 Bytes
(110%)
Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over5.png
Oops, something went wrong.
Binary file modified
BIN
+288 Bytes
(110%)
Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over6.png
Oops, something went wrong.
Binary file modified
BIN
+243 Bytes
(110%)
Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over7.png
Oops, something went wrong.
Binary file modified
BIN
-84 Bytes
(96%)
Resources/Textures/Structures/Walls/solid_rust.rsi/rgeneric.png
Oops, something went wrong.
Binary file modified
BIN
+338 Bytes
(110%)
Resources/Textures/Structures/Walls/solid_rust.rsi/solid0.png
Oops, something went wrong.
Binary file modified
BIN
+509 Bytes
(120%)
Resources/Textures/Structures/Walls/solid_rust.rsi/solid1.png
Oops, something went wrong.
Binary file modified
BIN
+338 Bytes
(110%)
Resources/Textures/Structures/Walls/solid_rust.rsi/solid2.png
Oops, something went wrong.
Binary file modified
BIN
+509 Bytes
(120%)
Resources/Textures/Structures/Walls/solid_rust.rsi/solid3.png
Oops, something went wrong.
Binary file modified
BIN
+602 Bytes
(120%)
Resources/Textures/Structures/Walls/solid_rust.rsi/solid4.png
Oops, something went wrong.
Binary file modified
BIN
+563 Bytes
(120%)
Resources/Textures/Structures/Walls/solid_rust.rsi/solid5.png
Oops, something went wrong.
Binary file modified
BIN
+625 Bytes
(120%)
Resources/Textures/Structures/Walls/solid_rust.rsi/solid6.png
Oops, something went wrong.
Binary file modified
BIN
+588 Bytes
(120%)
Resources/Textures/Structures/Walls/solid_rust.rsi/solid7.png
Oops, something went wrong.