DocNight
|
5687008aad
|
Merge pull request #152 from frosty-dev/benches-huge-coc
[Feat] Диваны и скамейки
|
2024-01-18 09:30:46 +03:00 |
|
RavMorgan
|
b9edbbcc28
|
[Tweak] del all useless pins (#137)
Co-authored-by: Mona Hmiza <>
|
2024-01-17 21:02:32 +07:00 |
|
rhailrake
|
484c8a8d9b
|
stats (#103)
* OH YES
* хули мне хедкодеру
# Conflicts:
# Content.Server/Instruments/InstrumentComponent.cs
# Content.Server/Instruments/InstrumentSystem.cs
# Content.Shared/Cuffs/SharedCuffableSystem.cs
# Content.Shared/White/WhiteCVars.cs
# Resources/Prototypes/tags.yml
|
2024-01-17 19:13:14 +07: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 |
|
Remuchi
|
296e8885c1
|
фиксы фиксульки
|
2024-01-17 18:17:35 +07:00 |
|
rhailrake
|
2dd362fb65
|
f (#96)
|
2024-01-17 12:07:29 +03:00 |
|
HitPanda
|
31f87a6a52
|
Craft menu translate (#88)
|
2024-01-17 12:05:45 +03: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 |
|
HitPanda
|
11149b0279
|
[FIX] SPONSOR
|
2024-01-17 11:17:41 +03:00 |
|
rhailrake
|
1fae101454
|
fuck (#79)
|
2024-01-17 11:12:57 +03:00 |
|
HitPanda
|
aa9bd80610
|
tail fix (#64)
|
2024-01-17 10:45:27 +03:00 |
|
HitPanda
|
25dc8d33b3
|
translate (#57)
|
2024-01-17 10:38:16 +03:00 |
|
RavMorgan
|
36185582b4
|
Перевод 😷 🔪 (#50)
Co-authored-by: Mona Hmiza <>
|
2024-01-17 10:25:56 +03:00 |
|
RavMorgan
|
0363780559
|
Vtergot tail (#46)
|
2024-01-17 10:25:36 +03:00 |
|
DocNITE
|
291cb0b92a
|
Ой, 18+ контент, извините
|
2024-01-17 08:59:35 +03:00 |
|
DocNITE
|
1a25826303
|
instantAction
|
2024-01-17 08:59:29 +03:00 |
|
RavMorgan
|
9a8b9d6aa0
|
[feature] ТРУСЫ (#12)
* Трусы и бра
* Тэги и тэмплейты инвентаря
* Спрайты
* Тэги и темплейт
* Флаги
* Перевод и прототипы
* Иконки
* Добавил слои
* Исправил циферки во флагах
* НОСКИ
* Трусы всем
* Блять
* СПРАЙТЫ БРА
* Насрано
* х2
* Примерно миллион трусов
* fff
* Носки(дохуя)
* Сука
* ааааааааааааааааааа
* Ебаные трусы блять
* Фикс иконок
---------
Co-authored-by: Mona Hmiza <>
|
2024-01-14 08:36:49 +03:00 |
|
Aviu00
|
2a29f563c8
|
Revert "[feature] ТРУСЫ (#12)"
This reverts commit 4bf54ed149.
|
2024-01-14 07:54:28 +03:00 |
|
EnefFlow
|
59b5f24842
|
Play button base
|
2024-01-14 06:41:33 +03:00 |
|
EnefFlow
|
1a729666f4
|
5 new voices
|
2024-01-13 10:02:20 +03:00 |
|
RavMorgan
|
4bf54ed149
|
[feature] ТРУСЫ (#12)
* Трусы и бра
* Тэги и тэмплейты инвентаря
* Спрайты
* Тэги и темплейт
* Флаги
* Перевод и прототипы
* Иконки
* Добавил слои
* Исправил циферки во флагах
* НОСКИ
* Трусы всем
* Блять
* СПРАЙТЫ БРА
* Насрано
* х2
* Примерно миллион трусов
* fff
* Носки(дохуя)
* Сука
* ааааааааааааааааааа
* Ебаные трусы блять
* Фикс иконок
---------
Co-authored-by: Mona Hmiza <>
|
2024-01-13 10:02:09 +03:00 |
|
rhailrake
|
a05364f1ac
|
[feat] Loadout, DeathGasps, EnergyDoubleCraftSystem
|
2024-01-13 09:22:48 +03:00 |
|
rhailrake
|
3c6093565d
|
[fix] Combat popup.
|
2024-01-13 09:16:25 +03:00 |
|
Aviu00
|
f4d3e0e920
|
Errors fix
|
2024-01-13 09:14:48 +03:00 |
|
rhailrake
|
2f055d1aed
|
Patch 1.9 (#39)
* Возьми ее на руки и скажи...
* tweaks
|
2024-01-13 09:14:47 +03:00 |
|
RavMorgan
|
26c6290be0
|
Felishit (#37)
* Мне слишком мало платят
* ЖРИ МЫШЕЙ
* Лок рас
* Але оп
* Блять
---------
Co-authored-by: Mona Hmiza <>
|
2024-01-13 09:14:47 +03:00 |
|
HitPanda
|
d65bc9a0d0
|
[Feat] CPR (#11)
* CPR ready
* Cycled DoAfter
* One more check
* last fixes
* Update damage
* some code clean up
|
2024-01-11 07:55:11 +03:00 |
|
rhailrake
|
0cbb69d0a1
|
[feat] SlangSatinization
# Conflicts:
# Content.Server/Chat/Systems/ChatSystem.cs
|
2024-01-10 20:24:10 +07:00 |
|
rhailrake
|
423c3db243
|
locale
# Conflicts:
# Resources/ServerInfo/Guidebook/Botany.xml
# Resources/ServerInfo/Guidebook/Controls/Controls.xml
# Resources/ServerInfo/Guidebook/Controls/Radio.xml
# Resources/ServerInfo/Guidebook/Engineering/AME.xml
# Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
# Resources/ServerInfo/Guidebook/Engineering/Fires.xml
# Resources/ServerInfo/Guidebook/Engineering/Power.xml
# Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Jobs.xml
# Resources/ServerInfo/Guidebook/Science/Science.xml
# Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
# Resources/ServerInfo/Guidebook/Security/DNA.xml
# Resources/ServerInfo/Guidebook/SpaceStation14.xml
# Resources/ServerInfo/Guidebook/Survival.xml
|
2024-01-10 19:52:08 +07:00 |
|