8 Commits

Author SHA1 Message Date
ThereDrD0
85b86f2026 Revert gersoon (#502)
* Revert "Изменено"

This reverts commit 985048acc6.

* fix naser
2024-07-26 22:06:15 +03:00
Gersoon
985048acc6 Изменено
Тайлы, декали, спрайты
Добавлено
Ебаные горршки и всё ыыа
2024-07-26 18:38:36 +02:00
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
2024-01-17 18:48:28 +07:00
HitPanda
1bdc7f848b [Feature] Old textures comeback (#86)
* interface

* objects

* nades

* airlocks

* furniture

* machines

* piping

* doors

* wallmounts

* ftl quick fix

* small fix
2024-01-17 11:20:13 +03:00
Moomoobeef
c64c98ec1d New sprites for books on bookshelves in order to look less sad. (#22874)
Changed sprites for books on bookshelves, added one missing sprite
2023-12-23 00:34:19 -05:00
Kit0vras
140aa89ba4 usable bookshelf (#15333)
Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-05-06 12:20:02 +10:00
Swept
e34888373a Respriting the codebase (#4820)
* Walls

* Airlocks mostly ported

* Disposal Unit

* Tiles

* Lighting

* Catwalk

* Windows

* Some vending machine work

* More Vending Machines

* Rest of vending machine sprites ported

* Fixes to vending machines

* Tables (This took a lot of work)

* Fixes low walls being required for window smoothing
- Also replaces window damage visualization

* Plasma Window

* APC

* SMES + Reorganized parts.yml

* Furniture and Organization and Removed Shelf

* Renamed seats.yml to chairs.yml

* Dispensers

* Lazy-fixed the glass airlocks

* Don't need this no more

* Tilez

* blue circuit my fucking beloved

* Switches lights to cev one

* Conveyors and Switch

* Reorients lights

* !ALERT! MAP CHANGES !ALERT!

Co-authored-by: Vera Aguilera Puerto <gradientvera@outlook.com>
2021-10-15 11:58:40 +02:00
Swept
5f9ba812ca Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00