[Feat] Airlocks lights + texture replace + some translate fixes (#97)
* Airlocks lights * bookshelf fix * killsign translate * some jobs names changes * outerclothing * clothing all * tiles * decals * bubbles * uranium glass * SMES fix * generators resprite * redundant delete * RSI validator fix # Conflicts: # Content.Client/Doors/AirlockSystem.cs # Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml # Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png # Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND.png # Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png # Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png # Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png # Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png # Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/equipped-NECK.png # Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/icon.png # Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK.png # Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png # Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/equipped-FEET.png # Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-equipped-FEET.png # Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/equipped-FEET.png # Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/on-equipped-FEET.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/icon.png # Resources/Textures/Effects/creampie.rsi/meta.json # Resources/Textures/Effects/speech.rsi/alien0.png # Resources/Textures/Effects/speech.rsi/alien1.png # Resources/Textures/Effects/speech.rsi/alien2.png # Resources/Textures/Effects/speech.rsi/alienroyal0.png # Resources/Textures/Effects/speech.rsi/alienroyal1.png # Resources/Textures/Effects/speech.rsi/alienroyal2.png # Resources/Textures/Effects/speech.rsi/blob0.png # Resources/Textures/Effects/speech.rsi/blob1.png # Resources/Textures/Effects/speech.rsi/blob2.png # Resources/Textures/Effects/speech.rsi/clock0.png # Resources/Textures/Effects/speech.rsi/clock1.png # Resources/Textures/Effects/speech.rsi/clock2.png # Resources/Textures/Effects/speech.rsi/default0.png # Resources/Textures/Effects/speech.rsi/default1.png # Resources/Textures/Effects/speech.rsi/default2.png # Resources/Textures/Effects/speech.rsi/guardian0.png # Resources/Textures/Effects/speech.rsi/guardian1.png # Resources/Textures/Effects/speech.rsi/guardian2.png # Resources/Textures/Effects/speech.rsi/holo0.png # Resources/Textures/Effects/speech.rsi/holo1.png # Resources/Textures/Effects/speech.rsi/holo2.png # Resources/Textures/Effects/speech.rsi/lawyer0.png # Resources/Textures/Effects/speech.rsi/lawyer1.png # Resources/Textures/Effects/speech.rsi/lawyer2.png # Resources/Textures/Effects/speech.rsi/machine0.png # Resources/Textures/Effects/speech.rsi/machine1.png # Resources/Textures/Effects/speech.rsi/machine2.png # Resources/Textures/Effects/speech.rsi/meta.json # Resources/Textures/Effects/speech.rsi/moth0.png # Resources/Textures/Effects/speech.rsi/moth1.png # Resources/Textures/Effects/speech.rsi/moth2.png # Resources/Textures/Effects/speech.rsi/robot0.png # Resources/Textures/Effects/speech.rsi/robot1.png # Resources/Textures/Effects/speech.rsi/robot2.png # Resources/Textures/Effects/speech.rsi/slime0.png # Resources/Textures/Effects/speech.rsi/slime1.png # Resources/Textures/Effects/speech.rsi/slime2.png # Resources/Textures/Effects/speech.rsi/swarmer0.png # Resources/Textures/Effects/speech.rsi/swarmer1.png # Resources/Textures/Effects/speech.rsi/swarmer2.png # Resources/Textures/Effects/speech.rsi/syndibot0.png # Resources/Textures/Effects/speech.rsi/syndibot1.png # Resources/Textures/Effects/speech.rsi/syndibot2.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_active.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_deactive.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_off.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_on.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json # Resources/Textures/Tiles/white_diagonal_mini.png
|
Before Width: | Height: | Size: 539 B After Width: | Height: | Size: 402 B |
|
Before Width: | Height: | Size: 242 B After Width: | Height: | Size: 442 B |
|
Before Width: | Height: | Size: 256 B After Width: | Height: | Size: 209 B |
|
Before Width: | Height: | Size: 387 B After Width: | Height: | Size: 670 B |
|
Before Width: | Height: | Size: 363 B After Width: | Height: | Size: 347 B |
|
Before Width: | Height: | Size: 363 B After Width: | Height: | Size: 347 B |
|
Before Width: | Height: | Size: 849 B After Width: | Height: | Size: 676 B |
|
Before Width: | Height: | Size: 795 B After Width: | Height: | Size: 362 B |
|
Before Width: | Height: | Size: 805 B After Width: | Height: | Size: 361 B |
|
Before Width: | Height: | Size: 242 B After Width: | Height: | Size: 454 B |
|
Before Width: | Height: | Size: 243 B After Width: | Height: | Size: 209 B |
|
Before Width: | Height: | Size: 387 B After Width: | Height: | Size: 683 B |
|
Before Width: | Height: | Size: 364 B After Width: | Height: | Size: 347 B |
|
Before Width: | Height: | Size: 362 B After Width: | Height: | Size: 347 B |
|
Before Width: | Height: | Size: 824 B After Width: | Height: | Size: 677 B |
|
Before Width: | Height: | Size: 780 B After Width: | Height: | Size: 362 B |
|
Before Width: | Height: | Size: 787 B After Width: | Height: | Size: 362 B |
|
Before Width: | Height: | Size: 242 B After Width: | Height: | Size: 458 B |
|
Before Width: | Height: | Size: 256 B After Width: | Height: | Size: 209 B |
|
Before Width: | Height: | Size: 387 B After Width: | Height: | Size: 684 B |
|
Before Width: | Height: | Size: 363 B After Width: | Height: | Size: 347 B |
|
Before Width: | Height: | Size: 363 B After Width: | Height: | Size: 347 B |
|
Before Width: | Height: | Size: 835 B After Width: | Height: | Size: 691 B |
|
Before Width: | Height: | Size: 769 B After Width: | Height: | Size: 362 B |
|
Before Width: | Height: | Size: 785 B After Width: | Height: | Size: 362 B |
|
Before Width: | Height: | Size: 242 B After Width: | Height: | Size: 425 B |
|
Before Width: | Height: | Size: 243 B After Width: | Height: | Size: 209 B |
|
Before Width: | Height: | Size: 387 B After Width: | Height: | Size: 624 B |
|
Before Width: | Height: | Size: 363 B After Width: | Height: | Size: 347 B |
|
Before Width: | Height: | Size: 363 B After Width: | Height: | Size: 347 B |
|
Before Width: | Height: | Size: 861 B After Width: | Height: | Size: 650 B |
|
Before Width: | Height: | Size: 796 B After Width: | Height: | Size: 363 B |
|
Before Width: | Height: | Size: 814 B After Width: | Height: | Size: 363 B |
|
Before Width: | Height: | Size: 242 B After Width: | Height: | Size: 449 B |
|
Before Width: | Height: | Size: 256 B After Width: | Height: | Size: 209 B |
|
Before Width: | Height: | Size: 387 B After Width: | Height: | Size: 670 B |
|
Before Width: | Height: | Size: 363 B After Width: | Height: | Size: 349 B |
|
Before Width: | Height: | Size: 363 B After Width: | Height: | Size: 347 B |
|
Before Width: | Height: | Size: 844 B After Width: | Height: | Size: 671 B |
|
Before Width: | Height: | Size: 777 B After Width: | Height: | Size: 364 B |
|
Before Width: | Height: | Size: 791 B After Width: | Height: | Size: 362 B |
|
After Width: | Height: | Size: 375 B |
|
After Width: | Height: | Size: 375 B |
@@ -0,0 +1,41 @@
|
||||
{
|
||||
"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": "icon-flash"
|
||||
},
|
||||
{
|
||||
"name": "off-equipped-HELMET",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "off-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "off-inhand-right",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "on-equipped-HELMET",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "on-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "on-inhand-right",
|
||||
"directions": 4
|
||||
}
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 584 B |
|
After Width: | Height: | Size: 562 B |
|
After Width: | Height: | Size: 541 B |
|
After Width: | Height: | Size: 584 B |
|
After Width: | Height: | Size: 565 B |
|
After Width: | Height: | Size: 582 B |
|
Before Width: | Height: | Size: 336 B After Width: | Height: | Size: 328 B |
|
After Width: | Height: | Size: 840 B |
BIN
Resources/Textures/Clothing/Head/Hardsuits/prisoner.rsi/icon.png
Normal file
|
After Width: | Height: | Size: 279 B |
|
After Width: | Height: | Size: 792 B |
|
After Width: | Height: | Size: 776 B |
@@ -0,0 +1,26 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"states": [
|
||||
{
|
||||
"name": "icon"
|
||||
},
|
||||
{
|
||||
"name": "equipped-HELMET",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "inhand-right",
|
||||
"directions": 4
|
||||
}
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 546 B |
BIN
Resources/Textures/Clothing/Head/Hardsuits/slayer.rsi/icon.png
Normal file
|
After Width: | Height: | Size: 546 B |
@@ -0,0 +1,41 @@
|
||||
{
|
||||
"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": "icon-flash"
|
||||
},
|
||||
{
|
||||
"name": "off-equipped-HELMET",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "off-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "off-inhand-right",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "on-equipped-HELMET",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "on-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "on-inhand-right",
|
||||
"directions": 4
|
||||
}
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 1.2 KiB |
|
After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 1.2 KiB |
|
After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 826 B After Width: | Height: | Size: 740 B |
|
Before Width: | Height: | Size: 485 B After Width: | Height: | Size: 330 B |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 891 B After Width: | Height: | Size: 486 B |
|
Before Width: | Height: | Size: 838 B After Width: | Height: | Size: 491 B |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 839 B After Width: | Height: | Size: 829 B |
|
Before Width: | Height: | Size: 493 B After Width: | Height: | Size: 354 B |
|
Before Width: | Height: | Size: 1008 B After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 934 B After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 891 B After Width: | Height: | Size: 513 B |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 805 B After Width: | Height: | Size: 742 B |
|
Before Width: | Height: | Size: 445 B After Width: | Height: | Size: 315 B |
|
Before Width: | Height: | Size: 744 B After Width: | Height: | Size: 861 B |
|
Before Width: | Height: | Size: 672 B After Width: | Height: | Size: 433 B |
|
Before Width: | Height: | Size: 648 B After Width: | Height: | Size: 432 B |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 447 B After Width: | Height: | Size: 673 B |
|
Before Width: | Height: | Size: 235 B After Width: | Height: | Size: 322 B |
|
Before Width: | Height: | Size: 547 B After Width: | Height: | Size: 705 B |
|
Before Width: | Height: | Size: 248 B After Width: | Height: | Size: 312 B |
|
Before Width: | Height: | Size: 582 B After Width: | Height: | Size: 559 B |
|
Before Width: | Height: | Size: 363 B After Width: | Height: | Size: 353 B |
|
Before Width: | Height: | Size: 536 B After Width: | Height: | Size: 549 B |
|
Before Width: | Height: | Size: 301 B After Width: | Height: | Size: 288 B |
|
Before Width: | Height: | Size: 547 B After Width: | Height: | Size: 552 B |
|
Before Width: | Height: | Size: 317 B After Width: | Height: | Size: 299 B |
|
Before Width: | Height: | Size: 557 B After Width: | Height: | Size: 546 B |