forked from space-wizards/space-station-14
-
Notifications
You must be signed in to change notification settings - Fork 33
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Nerf * Revert "Nerf" This reverts commit f9d2a58. * Revert "Security Resprite (space-wizards#29082)" This reverts commit 4cf60f8. # Conflicts: # Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json # Resources/migration.yml * Get fedora new textures back, same with detective coats. Fix RSI test fail --------- Co-authored-by: MilenVolf <milen.volf@gmail.com>
- Loading branch information
1 parent
17c0da8
commit 62bb0b9
Showing
101 changed files
with
119 additions
and
111 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
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
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 removed
BIN
-323 Bytes
Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET-dog.png
Binary file not shown.
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 removed
BIN
-292 Bytes
Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/equipped-HELMET-dog.png
Binary file not shown.
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 added
BIN
+609 Bytes
Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.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
+344 Bytes
(210%)
Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.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
BIN
+347 Bytes
(210%)
Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.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
+344 Bytes
(210%)
Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.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
-109 Bytes
(89%)
Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET-vox.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
(96%)
Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.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
+138 Bytes
(120%)
Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.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
+141 Bytes
(120%)
Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.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/Head/Helmets/light_riot.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
+124 Bytes
(110%)
Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.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
+93 Bytes
(110%)
Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.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
+266 Bytes
(170%)
Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.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
+259 Bytes
(170%)
Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.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 added
BIN
+952 Bytes
Resources/Textures/Clothing/Head/Helmets/security.rsi/light-equipped-HELMET.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 added
BIN
+1.04 KB
Resources/Textures/Clothing/Head/Helmets/security.rsi/lighton-equipped-HELMET.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
-58 Bytes
(93%)
Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET-vox.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
(97%)
Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET.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
+262 Bytes
(170%)
Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-left.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
+465 Bytes
(220%)
Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-right.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
-6 Bytes
(99%)
...urces/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/equipped-HELMET-vox.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
+85 Bytes
(110%)
Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-left.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
+108 Bytes
(120%)
Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-right.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/Head/Helmets/swat_syndicate.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
-102 Bytes
(86%)
.../Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING-vox.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
+543 Bytes
(180%)
...ures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png
Oops, something went wrong.
Binary file modified
BIN
+170 Bytes
(150%)
Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png
Oops, something went wrong.
Binary file modified
BIN
+336 Bytes
(190%)
Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png
Oops, something went wrong.
Binary file modified
BIN
+320 Bytes
(190%)
...urces/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.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 added
BIN
+972 Bytes
.../Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/equipped-OUTERCLOTHING.png
Oops, something went wrong.
Binary file added
BIN
+435 Bytes
Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/icon.png
Oops, something went wrong.
Binary file added
BIN
+543 Bytes
Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-left.png
Oops, something went wrong.
Binary file added
BIN
+540 Bytes
Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-right.png
Oops, something went wrong.
26 changes: 26 additions & 0 deletions
26
Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "icon" | ||
}, | ||
{ | ||
"name": "equipped-OUTERCLOTHING", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-right", | ||
"directions": 4 | ||
} | ||
] | ||
} |
Binary file modified
BIN
+931 Bytes
(210%)
...Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING-vox.png
Oops, something went wrong.
Binary file modified
BIN
+768 Bytes
(190%)
...ces/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png
Oops, something went wrong.
Binary file modified
BIN
+74 Bytes
(120%)
Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png
Oops, something went wrong.
Binary file modified
BIN
+4.66 KB
(330%)
Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png
Oops, something went wrong.
Binary file modified
BIN
+4.68 KB
(330%)
Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
Resources/Textures/Clothing/OuterClothing/Coats/warden.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
-28 Bytes
(94%)
...extures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING-vox.png
Oops, something went wrong.
Binary file modified
BIN
+37 Bytes
(100%)
...es/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING.png
Oops, something went wrong.
Binary file modified
BIN
-214 Bytes
(57%)
Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/icon.png
Oops, something went wrong.
Binary file modified
BIN
-77 Bytes
(80%)
Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-left.png
Oops, something went wrong.
Binary file modified
BIN
-48 Bytes
(88%)
Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-right.png
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
Resources/Textures/Clothing/OuterClothing/Vests/detvest.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 added
BIN
+20.2 KB
.../Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING-monkey.png
Oops, something went wrong.
Binary file modified
BIN
+598 Bytes
(190%)
Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png
Oops, something went wrong.
Binary file modified
BIN
-81 Bytes
(78%)
Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png
Oops, something went wrong.
Binary file added
BIN
+403 Bytes
Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-left.png
Oops, something went wrong.
Binary file added
BIN
+410 Bytes
Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-right.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 added
BIN
+7.48 KB
...ures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING-monkey.png
Oops, something went wrong.
Binary file modified
BIN
-1 Byte
(100%)
...es/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
Oops, something went wrong.
Binary file modified
BIN
-29 Bytes
(92%)
Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
Oops, something went wrong.
Binary file added
BIN
+358 Bytes
Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-left.png
Oops, something went wrong.
Binary file added
BIN
+362 Bytes
Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-right.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 added
BIN
+20.6 KB
...xtures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING-monkey.png
Oops, something went wrong.
Binary file modified
BIN
+581 Bytes
(190%)
...rces/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png
Oops, something went wrong.
Binary file modified
BIN
+167 Bytes
(150%)
Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png
Oops, something went wrong.
Binary file added
BIN
+395 Bytes
Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-left.png
Oops, something went wrong.
Binary file added
BIN
+402 Bytes
Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-right.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 added
BIN
+20.6 KB
...s/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING-monkey.png
Oops, something went wrong.
Binary file modified
BIN
+765 Bytes
(210%)
Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png
Oops, something went wrong.
Binary file modified
BIN
-119 Bytes
(66%)
Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png
Oops, something went wrong.
Binary file added
BIN
+403 Bytes
Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-left.png
Oops, something went wrong.
Binary file added
BIN
+410 Bytes
Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-right.png
Oops, something went wrong.
Oops, something went wrong.