 Morb0
|
87fe5c0a4d
|
Update locale
|
2024-04-01 00:24:21 +03:00 |
|
|
Morb0
|
eb75c67cf8
|
Merge remote-tracking branch 'upstream/april-fools-2024' into april-fools-2024
# Conflicts:
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Datasets/tips.yml
# Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
# Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
# Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
# Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
# Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-right.png
# Resources/Textures/Mobs/Animals/regalrat.rsi/regalrat.png
# Resources/Textures/Structures/Storage/tanks.rsi/fueltank-2.png
# Resources/Textures/Structures/Storage/tanks.rsi/fueltank.png
|
2024-03-31 23:19:45 +03:00 |
|
|
MorbandGitHub
|
4e2b5bee2f
|
Merge pull request #2002 from space-syndicate/upstream-sync
Upstream sync
|
2024-03-29 15:50:25 +03:00 |
|
|
Morb0
|
9594c9304c
|
Update locale
|
2024-03-29 15:30:20 +03:00 |
|
|
Morb0
|
1fffefa898
|
Fix VoiceMaskNameChangeWindow.xaml.cs
|
2024-03-29 11:47:17 +03:00 |
|
|
Morb0
|
c44d509701
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
# Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Content.Server/VoiceMask/VoiceMaskerComponent.cs
# Content.Shared/VoiceMask/SharedVoiceMaskSystem.cs
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Textures/Interface/Alerts/essence_counter.rsi/essence0.png
# Resources/Textures/Interface/Alerts/essence_counter.rsi/essence16.png
|
2024-03-29 11:43:30 +03:00 |
|
|
Morb0
|
a125ca2514
|
Fix CLRF to LF
|
2024-03-28 11:42:27 +03:00 |
|
|
Morb0
|
1155cf1be3
|
Set 20h bunker for Solaris
|
2024-03-28 10:17:52 +03:00 |
|
|
MorbandGitHub
|
f9985432ba
|
Merge pull request #1993 from space-syndicate/upstream-sync
Upstream sync
|
2024-03-27 01:53:31 +03:00 |
|
|
Morb0
|
a45c5db60a
|
Update locale
|
2024-03-27 01:32:00 +03:00 |
|
|
Morb0
|
ef1ca87cff
|
Fix meta.json
|
2024-03-27 01:31:18 +03:00 |
|
|
Morb0
|
6fc8c1cd54
|
Merge remote-tracking branch 'upstream/master' into master-syndicate
# Conflicts:
# Content.Packaging/ServerPackaging.cs
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/packed.yml
# Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json
# Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json
# Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/meta.json
# Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/meta.json
# Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/meta.json
# Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/meta.json
# Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/meta.json
# Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/lingarmor.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon-open.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon-open.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon-open.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/equipped-OUTERCLOTHING-reptilian.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-equipped-OUTERCLOTHING-reptilian.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Specific/bling.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/meta.json
# Resources/Textures/Mobs/Animals/regalrat.rsi/meta.json
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/meta.json
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
# Resources/Textures/Structures/Holo/holofan.rsi/meta.json
# Resources/Textures/Structures/Holo/wetfloor.rsi/meta.json
|
2024-03-27 01:12:55 +03:00 |
|
|
MorbandGitHub
|
12f6a59c14
|
Merge pull request #1980 from space-syndicate/upstream-sync
Upstream sync
|
2024-03-21 01:38:34 +03:00 |
|
|
Morb0
|
22413b8320
|
Update locale
|
2024-03-21 01:31:53 +03:00 |
|
|
Morb0
|
8daf4b3f32
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Prototypes/Datasets/tips.yml
# Resources/Prototypes/StatusIcon/antag.yml
# Resources/ServerInfo/Guidebook/Engineering/TEG.xml
# Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
# Resources/Textures/Structures/stairs.rsi/meta.json
|
2024-03-21 01:15:13 +03:00 |
|
|
MorbandGitHub
|
6f8e0e12b2
|
Merge pull request #1969 from space-syndicate/upstream-sync
Upstream sync
|
2024-03-17 16:21:53 +03:00 |
|
|
Morb0
|
b12b5af0c7
|
Update locale
|
2024-03-17 14:58:13 +03:00 |
|
|
Morb0
|
a751abc778
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Server/Connection/ConnectionManager.cs
# Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml
|
2024-03-17 14:01:54 +03:00 |
|
|
MorbandGitHub
|
04a7b7229c
|
Merge pull request #1957 from space-syndicate/upstream-sync
Upstream sync
|
2024-03-13 18:06:11 +03:00 |
|
|
Morb0
|
d0528cbb42
|
Update locale
|
2024-03-13 17:18:30 +03:00 |
|
|
Morb0
|
837a7f9b0d
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
|
2024-03-13 17:02:47 +03:00 |
|
|
MorbandGitHub
|
ca0e501f03
|
Merge pull request #1949 from space-syndicate/upstream-sync
Upstream sync
|
2024-03-11 09:07:06 +03:00 |
|
|
Morb0
|
f5e8409c73
|
Update locale
|
2024-03-11 08:46:27 +03:00 |
|
|
Morb0
|
4f43e73d14
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Prototypes/SoundCollections/NukeMusic.yml
|
2024-03-11 08:37:54 +03:00 |
|
|
Morb0
|
7a8e3e1e24
|
Update locale
|
2024-03-09 01:49:45 +03:00 |
|
|
MorbandGitHub
|
538d83120e
|
Merge pull request #1924 from space-syndicate/upstream-sync
Upstream sync
|
2024-03-08 23:23:35 +03:00 |
|
|
Morb0
|
ceb3896870
|
Resave Avrite
|
2024-03-08 23:11:31 +03:00 |
|
|
Morb0
|
2ee6f8aa52
|
Re-save maps
|
2024-03-08 22:45:47 +03:00 |
|
|
Morb0
|
a38ca49b4a
|
Remove RecentlyDocked from maps
|
2024-03-08 16:38:39 +03:00 |
|
|
Morb0
|
4dbdf942b0
|
Deduplicate BrassChair
|
2024-03-08 16:15:04 +03:00 |
|
|
Morb0
|
761c15c1f8
|
Disable pacifist thieves
|
2024-03-08 16:08:53 +03:00 |
|
|
Morb0
|
b70efe1fa8
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Client/Audio/ContentAudioSystem.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
# Resources/Prototypes/Datasets/Names/first_male.yml
# Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
# Resources/Prototypes/GameRules/roundstart.yml
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json
# Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNESW.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNWSE.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal_checker_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal_checker_b.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/fulltile_overlay.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_180.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_270.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_90.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/herringbone.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/meta.json
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_checker_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_checker_b.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal_b.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/mono.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/offset.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/offset_checker_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/offset_checker_b.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_checker_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_checker_b.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_b.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_180.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_270.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_90.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_180.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_270.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_90.png
# Resources/Textures/Objects/Materials/Sheets/glass.rsi/meta.json
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
# Resources/Textures/Structures/Windows/directional.rsi/meta.json
|
2024-03-08 16:05:59 +03:00 |
|
|
Morb0
|
3f33c064d2
|
Fix admin queue bypass
|
2024-02-29 21:04:14 +03:00 |
|
|
MorbandGitHub
|
64510e06f6
|
Merge pull request #1907 from space-syndicate/upstream-sync
Upstream sync
|
2024-02-29 13:35:47 +03:00 |
|
|
Morb0
|
a3c95a0418
|
Fix tests
|
2024-02-29 13:19:02 +03:00 |
|
|
Morb0
|
2f1f6f41e7
|
Generate locale
|
2024-02-29 12:51:46 +03:00 |
|
|
Morb0
|
88e3459584
|
Update locale
|
2024-02-29 12:38:13 +03:00 |
|
|
Morb0
|
f135b32a88
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Resources/Prototypes/Datasets/tips.yml
# Resources/ServerInfo/Guidebook/Jobs.xml
# Resources/Textures/Structures/Windows/directional.rsi/meta.json
|
2024-02-29 12:28:26 +03:00 |
|
|
Morb0
|
61a35a87ba
|
Translate close-master-pr message workflow
|
2024-02-27 15:05:15 +03:00 |
|
|
MorbandGitHub
|
7ae3f4e99b
|
Merge pull request #1893 from space-syndicate/upstream-sync
Upstream sync
|
2024-02-26 19:45:57 +03:00 |
|
|
Morb0
|
5f8b3589b4
|
Fix locale
|
2024-02-26 19:32:15 +03:00 |
|
|
Morb0
|
3053b36c9e
|
Update locale
|
2024-02-26 17:50:21 +03:00 |
|
|
Morb0
|
cea26891c8
|
Fix sponsors prototypes
|
2024-02-26 16:11:35 +03:00 |
|
|
Morb0
|
fe48e6deda
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Client/Preferences/ClientPreferencesManager.cs
# Content.Server/Connection/ConnectionManager.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Content.Shared/Preferences/ICharacterProfile.cs
# Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
# Resources/Prototypes/Datasets/Names/fortunes.yml
# Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
# Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
# SpaceStation14.sln
|
2024-02-26 15:14:44 +03:00 |
|
|
MorbandGitHub
|
7c3a7ad63a
|
Merge pull request #1885 from space-syndicate/upstream-sync
Upstream sync
|
2024-02-22 15:44:43 +03:00 |
|
|
Morb0
|
4744fe6ccd
|
Update locale
|
2024-02-22 14:28:00 +03:00 |
|
|
Morb0
|
a0307f20be
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
|
2024-02-22 14:21:29 +03:00 |
|
|
Morb0
|
5ce36b2296
|
Apply IAA on Train station
|
2024-02-22 14:10:20 +03:00 |
|
|
Morb0
|
0f7f420cbe
|
Update locale
|
2024-02-22 13:37:51 +03:00 |
|
|
Morb0
|
4ee0df9498
|
Merge remote-tracking branch 'upstream/master' into master-syndie
# Conflicts:
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Textures/Structures/stairs.rsi/meta.json
# Resources/Textures/Structures/stairs.rsi/stairs.png
# Resources/Textures/Structures/stairs.rsi/stairs_stage.png
|
2024-02-22 13:19:02 +03:00 |
|
|
MorbandGitHub
|
f7a6c7635a
|
Merge pull request #1877 from space-syndicate/upstream-sync
Upstream sync
|
2024-02-18 02:43:04 +03:00 |
|
|
Morb0
|
92aae19f59
|
Fix locale
|
2024-02-18 02:41:47 +03:00 |
|
|
Morb0
|
7a96cfa126
|
Update locale
|
2024-02-18 02:38:52 +03:00 |
|
|
Morb0
|
db07fb5098
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
|
2024-02-18 02:20:00 +03:00 |
|
|
MorbandGitHub
|
8ed4939214
|
Merge pull request #1875 from space-syndicate/upstream-sync
Upstream sync
|
2024-02-17 13:28:38 +03:00 |
|
|
Morb0
|
b982da58c5
|
Fix emitter unlocked state name
|
2024-02-17 13:02:12 +03:00 |
|
|
Morb0
|
d3674f18f2
|
Move custom chat sanitization to corvax ftl
|
2024-02-17 12:45:56 +03:00 |
|
|
Morb0
|
3cf641cd9a
|
Add idle state to vox typing indicator
|
2024-02-17 12:44:41 +03:00 |
|
|
Morb0
|
92bd0148fe
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Server/Administration/Systems/AdminSystem.cs
# Resources/Locale/en-US/chat/sanitizer-replacements.ftl
# Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
# Resources/Prototypes/StatusIcon/antag.yml
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png
# Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png
# Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png
|
2024-02-17 12:43:04 +03:00 |
|
|
Morb0
|
1048124655
|
Ignore server secrets prototypes on client build
|
2024-02-16 13:41:00 +03:00 |
|
|
MorbandGitHub
|
c9e5afdd60
|
TTS optimization (#1873)
|
2024-02-16 13:34:14 +03:00 |
|
|
Morb0
|
248610d278
|
Move out loadout system to Secrets
|
2024-02-12 20:42:59 +03:00 |
|
|
MorbandGitHub
|
baa121684a
|
Merge pull request #1869 from space-syndicate/upstream-sync
Upstream sync
|
2024-02-12 13:33:50 +03:00 |
|
|
Morb0
|
2b78f5be1b
|
Largo puller no need hands
|
2024-02-12 13:17:25 +03:00 |
|
|
Morb0
|
a90d1000e5
|
Update locale
|
2024-02-12 13:07:26 +03:00 |
|
|
Morb0
|
70e63172f7
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# README.md
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/ServerInfo/Guidebook/Cargo/Cargo.xml
# Resources/ServerInfo/Guidebook/Medical/Cloning.xml
# Resources/ServerInfo/Guidebook/Survival.xml
# Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/meta.json
# Resources/Textures/Objects/Tools/t-ray.rsi/meta.json
# Resources/Textures/Objects/Tools/t-ray.rsi/tray-off.png
# Resources/Textures/Objects/Tools/t-ray.rsi/tray-on.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/open.png
|
2024-02-12 12:53:34 +03:00 |
|
|
MorbandGitHub
|
09f08ef9ee
|
Merge pull request #1839 from space-syndicate/upstream-sync
Upstream sync
|
2024-02-03 04:14:12 +03:00 |
|
|
Morb0
|
3c592405a5
|
Update locale & fix print id
|
2024-02-03 04:02:52 +03:00 |
|
|
Morb0
|
bc161df9d4
|
Add fake lizard3 typing indicator
|
2024-02-03 03:46:28 +03:00 |
|
|
Morb0
|
32a8d1a21e
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
# Content.Server/Power/Generator/GeneratorSystem.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Objects/Misc/paper.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/assembly.png
|
2024-02-03 03:38:29 +03:00 |
|
|
Morb0
|
a7620713e7
|
Update server config
|
2024-02-03 03:22:39 +03:00 |
|
|
Morb0
|
8ec83ef0fb
|
Update server descriptions
|
2024-02-02 18:28:25 +03:00 |
|
|
Morb0
|
5b87117468
|
Update server descriptions
|
2024-02-01 22:23:45 +03:00 |
|
|
MorbandGitHub
|
f25906c16e
|
Merge pull request #1824 from space-syndicate/upstream-sync
Upstream sync
|
2024-01-31 01:23:53 +03:00 |
|
|
Morb0
|
5ca19e1ad5
|
Update locale
|
2024-01-31 01:09:19 +03:00 |
|
|
Morb0
|
0d30db874d
|
Fix maps
|
2024-01-31 00:35:26 +03:00 |
|
|
Morb0
|
ec5d3e98b6
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
# Resources/Prototypes/Maps/aspid.yml
# Resources/Prototypes/Maps/gemini.yml
# Resources/Prototypes/Roles/Jobs/Civilian/detective.yml
# Tools/actions_changelogs_since_last_run.py
|
2024-01-31 00:23:19 +03:00 |
|
|
MorbandGitHub
|
f5c51be6eb
|
Merge pull request #1809 from space-syndicate/upstream-sync
Upstream sync
|
2024-01-27 23:22:05 +03:00 |
|
|
Morb0
|
d9aac14e2f
|
Update locale
|
2024-01-27 23:05:47 +03:00 |
|
|
Morb0
|
0726764e66
|
Fix Astra map
|
2024-01-27 22:41:59 +03:00 |
|
|
Morb0
|
06e45fbb4d
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
# Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Objects/Tools/jaws_of_life.rsi/meta.json
# Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_inhand-left.png
# Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_inhand-right.png
|
2024-01-27 22:15:20 +03:00 |
|
|
MorbandGitHub
|
eca6c79cd6
|
Merge pull request #1803 from space-syndicate/upstream-sync
Upstream sync
|
2024-01-26 15:07:49 +03:00 |
|
|
Morb0
|
3d7149d3cb
|
Update locale
|
2024-01-26 14:50:57 +03:00 |
|
|
Morb0
|
3c28323dfe
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Prototypes/SoundCollections/lobby.yml
|
2024-01-26 14:17:51 +03:00 |
|
|
Morb0
|
892edd534f
|
Remove lobby sound
|
2024-01-26 03:42:58 +03:00 |
|
|
Morb0
|
b55930ab55
|
Remove Corvax speaker color
|
2024-01-26 01:37:25 +03:00 |
|
|
Morb0
|
0bc551fb9d
|
Return rusted walls
|
2024-01-26 01:27:54 +03:00 |
|
|
Morb0
|
5aa1642ba2
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/VoiceMask/VoiceMaskComponent.cs
# Resources/Prototypes/SoundCollections/lobby.yml
# Resources/ServerInfo/Guidebook/Science/MachineUpgrading.xml
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon-flash.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json
# Resources/Textures/Structures/Walls/solidrust.rsi/full.png
# Resources/Textures/Structures/Walls/solidrust.rsi/meta.json
# Resources/Textures/Structures/Walls/solidrust.rsi/solidrust0.png
# Resources/Textures/Structures/Walls/solidrust.rsi/solidrust1.png
# Resources/Textures/Structures/Walls/solidrust.rsi/solidrust2.png
# Resources/Textures/Structures/Walls/solidrust.rsi/solidrust3.png
# Resources/Textures/Structures/Walls/solidrust.rsi/solidrust4.png
# Resources/Textures/Structures/Walls/solidrust.rsi/solidrust5.png
# Resources/Textures/Structures/Walls/solidrust.rsi/solidrust6.png
# Resources/Textures/Structures/Walls/solidrust.rsi/solidrust7.png
|
2024-01-26 01:14:50 +03:00 |
|
|
MorbandGitHub
|
194c032f94
|
Fix reptilian digi (#1796)
|
2024-01-23 02:19:41 +03:00 |
|
|
Morb0
|
6469596962
|
Disable record of TTS in replays
|
2024-01-22 04:45:22 +03:00 |
|
|
Morb0
|
85358f3a68
|
Hotfix chemical use division by zero
|
2024-01-22 00:08:35 +03:00 |
|
|
MorbandGitHub
|
b10bab3a2b
|
Merge pull request #1792 from space-syndicate/upstream-sync
Upstream sync
|
2024-01-21 16:52:59 +03:00 |
|
|
Morb0
|
05af413067
|
Update locale
|
2024-01-21 16:28:51 +03:00 |
|
|
Morb0
|
d8282512a2
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Textures/Structures/Wallmounts/camera.rsi/meta.json
|
2024-01-21 16:10:42 +03:00 |
|
|
MorbandGitHub
|
0814705816
|
Merge pull request #1787 from space-syndicate/upstream-sync
Upstream sync
|
2024-01-21 05:00:04 +03:00 |
|
|
Morb0
|
eeb399f226
|
Update locale
|
2024-01-21 04:37:25 +03:00 |
|
|
Morb0
|
b12f1277a4
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
|
2024-01-21 04:34:01 +03:00 |
|
|
Morb0
|
adbbfe9d51
|
Use MetalBreak collection
|
2024-01-21 04:30:21 +03:00 |
|
|
Morb0
|
f451c7923b
|
Fix locale
|
2024-01-21 04:21:36 +03:00 |
|
|
Morb0
|
5471137219
|
Update locale
|
2024-01-21 04:11:13 +03:00 |
|