master
4 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
ThereDrD0
|
85b86f2026 |
Revert gersoon (#502)
* Revert "Изменено"
This reverts commit
|
||
Gersoon
|
985048acc6 |
Изменено
Тайлы, декали, спрайты Добавлено Ебаные горршки и всё ыыа |
||
HitPanda
|
10609a2506 |
[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 |
||
mirrorcult
|
31769edf5f |
Decal Placer + add new decals for mapping (#6548)
* abomination * okay its less unabashedly garbage now * other UI changes * its britney bitch * proper greyscale full/half/quarter tiles * misc cleanup * rsi * Add a palette system. It's Kara's problem now. * oops * a * Departmental palette alpha tweaks * oopy * so true * Update Content.Shared/Decals/ColorPalettePrototype.cs Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * fixes for that * neutral light color and new warning lines * dirt * checkerboards * oop Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> |
