27488 Commits

Author SHA1 Message Date
PJBot
538277e459 Automatic changelog update 2024-01-17 16:47:13 +00:00
Kara
fd3222993e Significantly less annoying eating sounds (#24195) 2024-01-17 11:46:06 -05:00
Boaz1111
0c78c34653 Xenoarch scanning time halved (#24188)
* SALVATION

* Update ArtifactAnalyzerComponent.cs

* Update artifact_analyzer.yml
2024-01-17 11:45:18 -05:00
RavMorgan
496aeda60e Самая сложная работа в моей жизни (#140)
Co-authored-by: Mona Hmiza <>
2024-01-17 21:08:10 +07:00
HitPanda
c72a604e93 [Sponsor] Leer fluff fix (#142) 2024-01-17 21:07:52 +07:00
HitPanda
823598ce3f [Sponsor] YouWellLeer new fluff (#141) 2024-01-17 21:07:44 +07:00
DocNight
89a690c09c Merge pull request #139 from frosty-dev/sprite-for-station-records
[фича] Отображение спрайта в консоли учетов
2024-01-17 21:07:33 +07:00
RavMorgan
f15ef66659 [FIX] Говняхи (#138)
* А щас

* Готово

* Ой, еще кое че

---------

Co-authored-by: Mona Hmiza <>
# Conflicts:
#	Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
2024-01-17 21:03:36 +07:00
RavMorgan
b9edbbcc28 [Tweak] del all useless pins (#137)
Co-authored-by: Mona Hmiza <>
2024-01-17 21:02:32 +07:00
RavMorgan
b1752f850c Новые слова в фильтре сленга (#135) 2024-01-17 20:58:55 +07:00
rhailrake
e3178bbcc3 [tweak] lets allow to return 2024-01-17 20:58:36 +07:00
DocNight
25252e0697 Merge pull request #129 from frosty-dev/animation-icons
[Tweak] Иконки для эмоуты анимаций
# Conflicts:
#	Resources/Prototypes/White/Actions/emotes.yml
2024-01-17 20:49:10 +07:00
Emisse
9383ad548d bagel update (#24191)
* bagel update

* ok a lot more
2024-01-17 06:18:19 -07:00
RavMorgan
111680e9a5 [Fix] Font Size 14 (#125)
# Conflicts:
#	Content.Client/Chat/UI/SpeechBubble.cs
#	Resources/Prototypes/fonts.yml
2024-01-17 20:16:15 +07:00
PJBot
087b4b090c Automatic changelog update 2024-01-17 13:15:39 +00:00
Kara
1fe2dda345 Change default lights on devmap to non-LED ones (#24192) 2024-01-17 06:14:52 -07:00
Kara
1f92376579 Reagent grinder jittering (#24190)
* Reagent grinder jittering

* Fix jittering for offset sprites
2024-01-17 06:14:32 -07:00
PJBot
cfc64fa8ca Automatic changelog update 2024-01-17 13:09:37 +00:00
Ubaser
6846bcd214 Grindable ores (#24185)
add
2024-01-17 16:08:31 +03:00
Remuchi
9ee24b096f прикол 2024-01-17 19:51:20 +07:00
RavMorgan
8b98c68ae2 Лишний стейт (#119)
Co-authored-by: Mona Hmiza <>
2024-01-17 19:32:32 +07:00
RavMorgan
a4db634a55 [FIX] yml linter (#121)
* Felinid linter

* Мб пофиксится

* сука?

* Revert "сука?"

This reverts commit daea319b5b1100981357ec76156da18e2767a39f.

* А щас....

* Короче насрано

* Дебил

---------

Co-authored-by: Mona Hmiza <>
# Conflicts:
#	Content.Server/White/MeatyOre/MeatyOreStoreSystem.cs
#	Resources/Prototypes/Damage/modifier_sets.yml
2024-01-17 19:32:06 +07:00
RavMorgan
c01e2ef930 Moth0-3 (#118)
Co-authored-by: Mona Hmiza <>
# Conflicts:
#	Resources/Textures/Effects/speech.rsi/moth0.png
#	Resources/Textures/Effects/speech.rsi/moth1.png
#	Resources/Textures/Effects/speech.rsi/moth2.png
2024-01-17 19:30:13 +07:00
RavMorgan
f2df7eeb89 Another exploit fix (#114)
* Revert "Critical fix(#106)"

This reverts commit b8eeed39e7f544efd9d7a4ae6f45f529afe21145.

* Але оп

---------

Co-authored-by: Mona Hmiza <>
# Conflicts:
#	Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs
2024-01-17 19:29:07 +07:00
Valtos
8a1ba0d8f9 fix lifeweb (#112) 2024-01-17 19:26:13 +07:00
HitPanda
46761ccdb6 [Fix] Windoor another fix (#111) 2024-01-17 19:26:04 +07:00
rhailrake
b50490cc40 fix (#110)
# Conflicts:
#	Content.Server/Weapons/Melee/EnergySword/EnergySwordSystem.cs
#	Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
2024-01-17 19:25:55 +07:00
EnefFlow
a872c1c12d [Fix] Fix for windoors + WonderBox prototype 2024-01-17 19:23:56 +07:00
rhailrake
01d2be78a0 [FIX] Я не ебу че грабли сделал
# Conflicts:
#	Resources/Prototypes/Catalog/catalog.yml
#	Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
#	Resources/Prototypes/Entities/Mobs/Player/skrell.yml
#	Resources/Prototypes/Species/arachnid.yml
#	Resources/Prototypes/Species/diona.yml
#	Resources/Prototypes/Species/dwarf.yml
#	Resources/Prototypes/Species/reptilian.yml
#	Resources/Prototypes/Species/skeleton.yml
#	Resources/Prototypes/Species/skrell.yml
#	Resources/Prototypes/Species/slime.yml
#	Resources/Prototypes/Species/vox.yml
#	Resources/Prototypes/Voice/speech_emote_sounds.yml
2024-01-17 19:23:32 +07:00
RavMorgan
58a368f703 [MAP] WonderBox V0.00000000001 PRE-ALHPA
Co-authored-by: Mona Hmiza <>
2024-01-17 19:18:16 +07:00
HitPanda
3e01330ea7 Critical fix(#106)
# Conflicts:
#	Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs
2024-01-17 19:18:06 +07:00
HitPanda
510f21f9e4 [Fix] Airlock lights quick fixes (#105)
* quick fixes

* more
2024-01-17 19:14:34 +07:00
HitPanda
7f3a204838 [Feat] Wonderbox station (#104)
* wonderbox

* quick fix
2024-01-17 19:14:12 +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
metalgearsloth
7d3fe676dd Remove obsolete ftl call (#24187)
Nothing burger
2024-01-17 23:01:40 +11: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
lzk
8239e59388 WelderRefinable light tubes bulbs and broken bottle (#24184)
s
2024-01-17 14:16:42 +03:00
PJBot
4cea4352eb Automatic changelog update 2024-01-17 10:04:07 +00:00
Ubaser
b6f0c35e72 Robohands glove sprite (#24182)
add
2024-01-17 03:03:00 -07:00
DrSmugleaf
8902701271 Move rotting stages and examine to shared (#24183) 2024-01-17 01:49:21 -08:00
Aviu00
5ff1756cb5 Small fix 2024-01-17 12:48:23 +03:00
RavMorgan
44ad721a3a Revert "Revert "self-hosted" (#94)" (#98)
This reverts commit 047171a475a56d94dacc10ba4c96222a543a2e15.

Co-authored-by: Mona Hmiza <>
2024-01-17 12:08:39 +03:00
RavMorgan
a8ac3c34bc Revert "self-hosted" (#94)
* Revert "self-hosted"
2024-01-17 12:08:17 +03:00
RavMorgan
436eb398ce self-hosted 2024-01-17 12:07:57 +03:00
rhailrake
2dd362fb65 f (#96) 2024-01-17 12:07:29 +03:00
RavMorgan
514c7d0513 Update labeler-pr.yml (#92) 2024-01-17 12:06:28 +03:00
RavMorgan
dcf55a24ed Update validate-rsis.yml (#90)
RSI validator
2024-01-17 12:06:19 +03:00
rhailrake
239bba24e5 [Tweak] old announce sounds 2024-01-17 12:06:05 +03:00
Kotovskiy34
c69c61012c Derderiot Fluff Fix 2024-01-17 12:05:55 +03:00