[Feat] Airlocks lights + texture replace + some translate fixes (#97)

Browse Source

* 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

...

This commit is contained in:

HitPanda

2023-05-24 21:47:35 +03:00

committed by Remuchi

parent 296e8885c1

commit 10609a2506

838 changed files with 925 additions and 300 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 242 B After Width:  |  Height:  |  Size: 442 B

BIN

Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 256 B After Width:  |  Height:  |  Size: 209 B

BIN

Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-equipped-HELMET.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 387 B After Width:  |  Height:  |  Size: 670 B

BIN

Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-left.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 363 B After Width:  |  Height:  |  Size: 347 B

BIN

Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-right.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 363 B After Width:  |  Height:  |  Size: 347 B

BIN

Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-equipped-HELMET.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 849 B After Width:  |  Height:  |  Size: 676 B

BIN

Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-left.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 795 B After Width:  |  Height:  |  Size: 362 B

BIN

Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-right.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 805 B After Width:  |  Height:  |  Size: 361 B

BIN

Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 242 B After Width:  |  Height:  |  Size: 454 B

BIN

Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 243 B After Width:  |  Height:  |  Size: 209 B

BIN

Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-equipped-HELMET.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 387 B After Width:  |  Height:  |  Size: 683 B

BIN

Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-left.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 364 B After Width:  |  Height:  |  Size: 347 B

BIN

Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-right.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 362 B After Width:  |  Height:  |  Size: 347 B

BIN

Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-equipped-HELMET.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 824 B After Width:  |  Height:  |  Size: 677 B

BIN

Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-left.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 780 B After Width:  |  Height:  |  Size: 362 B

BIN

Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-right.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 787 B After Width:  |  Height:  |  Size: 362 B

BIN

Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 242 B After Width:  |  Height:  |  Size: 458 B

BIN

Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 256 B After Width:  |  Height:  |  Size: 209 B

BIN

Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-equipped-HELMET.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 387 B After Width:  |  Height:  |  Size: 684 B

BIN

Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-left.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 363 B After Width:  |  Height:  |  Size: 347 B

BIN

Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-right.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 363 B After Width:  |  Height:  |  Size: 347 B

BIN

Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-equipped-HELMET.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 835 B After Width:  |  Height:  |  Size: 691 B

BIN

Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-left.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 769 B After Width:  |  Height:  |  Size: 362 B

BIN

Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-right.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 785 B After Width:  |  Height:  |  Size: 362 B

BIN

Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 242 B After Width:  |  Height:  |  Size: 425 B

BIN

Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 243 B After Width:  |  Height:  |  Size: 209 B

BIN

Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-equipped-HELMET.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 387 B After Width:  |  Height:  |  Size: 624 B

BIN

Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-left.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 363 B After Width:  |  Height:  |  Size: 347 B

BIN

Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-right.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 363 B After Width:  |  Height:  |  Size: 347 B

BIN

Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-equipped-HELMET.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 861 B After Width:  |  Height:  |  Size: 650 B

BIN

Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-left.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 796 B After Width:  |  Height:  |  Size: 363 B

BIN

Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-right.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 814 B After Width:  |  Height:  |  Size: 363 B

BIN

Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 242 B After Width:  |  Height:  |  Size: 449 B

BIN

Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 256 B After Width:  |  Height:  |  Size: 209 B

BIN

Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-equipped-HELMET.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 387 B After Width:  |  Height:  |  Size: 670 B

BIN

Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-left.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 363 B After Width:  |  Height:  |  Size: 349 B

BIN

Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-right.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 363 B After Width:  |  Height:  |  Size: 347 B

BIN

Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-equipped-HELMET.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 844 B After Width:  |  Height:  |  Size: 671 B

BIN

Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-left.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 777 B After Width:  |  Height:  |  Size: 364 B

BIN

Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-right.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 791 B After Width:  |  Height:  |  Size: 362 B