 MorbandGitHub
|
acb8f7a2fd
|
Disable damage threshold check
|
2024-10-17 02:27:22 +03:00 |
|
|
MorbandGitHub
|
5c487f1213
|
Merge pull request #2677 from space-syndicate/upstream-sync
Upstream sync
|
2024-10-15 19:23:23 +03:00 |
|
|
Morb0
|
807791cd2a
|
Update locale
|
2024-10-15 18:48:35 +03:00 |
|
|
Morb0
|
70c93b5fa4
|
Merge branch 'master' into upstream-sync
|
2024-10-15 18:43:40 +03:00 |
|
|
Morb0
|
74885605cf
|
Fix upstream
|
2024-10-15 18:13:43 +03:00 |
|
|
Morb0
|
0eba25c0eb
|
Merge remote-tracking branch 'wizards/master' into upstream-sync
# Conflicts:
# .github/CODEOWNERS
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/GameRules/midround.yml
# Resources/Prototypes/GameRules/roundstart.yml
# Resources/Prototypes/Loadouts/loadout_groups.yml
# Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
|
2024-10-15 17:04:40 +03:00 |
|
|
MorbandGitHub
|
4b8ecbb16e
|
Remove custom PaperPrinter and use Paper material (#2644)
|
2024-10-05 14:38:10 +03:00 |
|
|
Morb0
|
2a02d863b3
|
Merge remote-tracking branch 'wizards/master'
|
2024-10-04 23:25:03 +03:00 |
|
|
MorbandGitHub
|
54a2d2072c
|
Merge pull request #2640 from space-syndicate/upstream-sync
Upstream sync
|
2024-10-04 20:44:09 +03:00 |
|
|
Morb0
|
46dfad9b4a
|
Update locale
|
2024-10-04 20:28:43 +03:00 |
|
|
Morb0
|
47b58a0282
|
Fix upstream
|
2024-10-04 20:05:59 +03:00 |
|
|
Morb0
|
3ab6d3ef71
|
Merge remote-tracking branch 'wizards/master' into upstream-sync
# Conflicts:
# .github/workflows/publish.yml
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
# Content.Server/GameTicking/GameTicker.Player.cs
# Content.Server/VoiceMask/VoiceMaskComponent.cs
# Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Content.Server/VoiceMask/VoiceMaskerComponent.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Entities/Clothing/Masks/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
# Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
# Resources/Prototypes/Roles/Jobs/Command/captain.yml
# Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
# Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
# Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
# Resources/Prototypes/Roles/Jobs/Science/research_director.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
# Resources/Textures/Tiles/attributions.yml
# Resources/Textures/Tiles/blue_circuit.png
# Resources/Textures/Tiles/green_circuit.png
# Resources/Textures/Tiles/steel.png
|
2024-10-04 19:47:54 +03:00 |
|
|
MorbandGitHub
|
a494f336c7
|
Update publish_multi_request.py
|
2024-09-24 21:37:18 +03:00 |
|
|
MorbandGitHub
|
646f432a4c
|
Merge pull request #2602 from space-syndicate/upstream-sync
Upstream sync
|
2024-09-19 16:16:17 +03:00 |
|
|
Morb0
|
ff91c2975b
|
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
|
2024-09-19 11:06:03 +03:00 |
|
|
Morb0
|
768b5e9862
|
Use categories for hide spawn menu
|
2024-09-19 11:05:49 +03:00 |
|
|
Morb0
|
71c08d6322
|
Remove old data (???)
|
2024-09-19 11:05:31 +03:00 |
|
|
Morb0
|
700df19e9b
|
Update locale
|
2024-09-19 11:04:59 +03:00 |
|
|
Morb0
|
828688bd58
|
Update publish publish
|
2024-09-19 10:33:03 +03:00 |
|
|
Morb0
|
34d3cf6293
|
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
# Conflicts:
# .github/workflows/publish.yml
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
# Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml
# Resources/ServerInfo/Guidebook/Security/Defusal.xml
# Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
|
2024-09-19 10:30:01 +03:00 |
|
|
MorbandGitHub
|
2a448a9c31
|
Merge pull request #2587 from space-syndicate/upstream-sync
Upstream sync
|
2024-09-13 09:10:31 +03:00 |
|
|
MorbandGitHub
|
13d399b0fb
|
Update publish-publish.yml
|
2024-09-13 09:09:48 +03:00 |
|
|
Morb0
|
ca32f59044
|
Update locale
|
2024-09-12 11:35:18 +03:00 |
|
|
Morb0
|
f2299c6f0f
|
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
|
2024-09-12 11:31:00 +03:00 |
|
|
MorbandGitHub
|
117f500ef4
|
Merge pull request #2580 from space-syndicate/upstream-sync
Upstream sync
|
2024-09-11 11:48:29 +03:00 |
|
|
Morb0
|
c188a25662
|
Update locale
|
2024-09-11 11:28:16 +03:00 |
|
|
Morb0
|
f01422b110
|
Fix yaml
|
2024-09-11 11:28:06 +03:00 |
|
|
Morb0
|
d9bfc5cdcb
|
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
# Conflicts:
# .github/PULL_REQUEST_TEMPLATE.md
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
# Resources/Prototypes/Maps/cog.yml
# Resources/Prototypes/Roles/Jobs/Civilian/visitor.yml
# Resources/Prototypes/Roles/Jobs/departments.yml
# Resources/ServerInfo/Guidebook/Security/Forensics.xml
# Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_7.png
# Resources/Textures/Structures/Walls/solid.rsi/meta.json
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png
# Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png
# Resources/Textures/Structures/Walls/solid.rsi/solid0.png
# Resources/Textures/Structures/Walls/solid.rsi/solid1.png
# Resources/Textures/Structures/Walls/solid.rsi/solid2.png
# Resources/Textures/Structures/Walls/solid.rsi/solid3.png
# Resources/Textures/Structures/Walls/solid.rsi/solid4.png
# Resources/Textures/Structures/Walls/solid.rsi/solid5.png
# Resources/Textures/Structures/Walls/solid.rsi/solid6.png
# Resources/Textures/Structures/Walls/solid.rsi/solid7.png
|
2024-09-11 10:56:49 +03:00 |
|
|
Morb0
|
cdc6913e1c
|
Merge branch 'refs/heads/master' into upstream-sync
|
2024-09-11 10:36:17 +03:00 |
|
|
Morb0
|
2b35b9922f
|
Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
# Resources/Prototypes/Entities/Objects/Misc/books.yml
# Resources/Prototypes/Maps/cog.yml
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
|
2024-09-07 08:35:45 +03:00 |
|
|
MorbandGitHub
|
ad04253520
|
Merge pull request #2556 from space-syndicate/upstream-sync
Upstream sync
|
2024-09-03 22:31:03 +03:00 |
|
|
Morb0
|
a8c6210c14
|
Update locale
|
2024-09-03 22:14:48 +03:00 |
|
|
Morb0
|
1c95353b06
|
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
# Conflicts:
# Resources/Prototypes/Entities/Objects/Misc/books.yml
|
2024-09-03 22:03:54 +03:00 |
|
|
MorbandGitHub
|
21890eb5a0
|
Merge pull request #2547 from space-syndicate/upstream-sync
Upstream sync
|
2024-09-01 23:01:21 +03:00 |
|
|
Morb0
|
d51b1d55df
|
Update locale
|
2024-09-01 22:35:11 +03:00 |
|
|
Morb0
|
0f339baab5
|
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
# Conflicts:
# Content.Server/Connection/ConnectionManager.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Entities/Stations/base.yml
|
2024-09-01 22:20:47 +03:00 |
|
|
Morb0
|
f5cd835f35
|
Make cat ears at HeadTop
|
2024-09-01 22:08:38 +03:00 |
|
|
MorbandGitHub
|
30744d5bc0
|
Merge pull request #2534 from space-syndicate/upstream-sync
Upstream sync
|
2024-08-31 16:34:59 +03:00 |
|
|
Morb0
|
fbb9301dcb
|
Update locale
|
2024-08-31 15:32:10 +03:00 |
|
|
Morb0
|
06709810c9
|
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
|
2024-08-31 14:55:55 +03:00 |
|
|
Morb0
|
85a4a7c901
|
Merge branch 'refs/heads/master' into upstream-sync
|
2024-08-31 14:55:29 +03:00 |
|
|
Morb0
|
1293a500a2
|
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
# Conflicts:
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png
|
2024-08-30 08:20:22 +03:00 |
|
|
Morb0
|
2adc49fd2e
|
Update locale
|
2024-08-30 08:10:14 +03:00 |
|
|
Morb0
|
a312df977d
|
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
# Conflicts:
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/icon.png
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json
# Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/Equipment/plant_bag.rsi/meta.json
# Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/meta.json
|
2024-08-29 08:24:44 +03:00 |
|
|
Morb0
|
721f7bfecf
|
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
# Conflicts:
# Content.Server/Connection/ConnectionManager.cs
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Datasets/adjectives.yml
# Resources/Prototypes/Datasets/verbs.yml
# Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
# Resources/Prototypes/Entities/Mobs/base.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png
# SpaceStation14.sln
|
2024-08-28 16:40:36 +03:00 |
|
|
MorbandGitHub
|
a2b5413e85
|
Add TTS rate limit (#2515)
|
2024-08-24 02:00:44 +03:00 |
|
|
MorbandGitHub
|
55f3ef826a
|
Merge pull request #2511 from space-syndicate/upstream-sync
Upstream sync
|
2024-08-23 10:32:23 +03:00 |
|
|
Morb0
|
40101ed554
|
Merge remote-tracking branch 'refs/remotes/syndie/master' into upstream-sync
|
2024-08-23 10:21:14 +03:00 |
|
|
Morb0
|
53a5f91801
|
Update locale
|
2024-08-23 10:14:14 +03:00 |
|
|
Morb0
|
f0c098a6f6
|
Fix upstream
|
2024-08-23 10:00:37 +03:00 |
|
|
Morb0
|
07a34aaaae
|
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
# Conflicts:
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/Prototypes/Loadouts/loadout_groups.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Prototypes/Species/human.yml
# Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
# 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/Structures/Wallmounts/signs.rsi/meta.json
|
2024-08-23 09:38:36 +03:00 |
|
|
MorbandGitHub
|
2cb25925ad
|
Merge pull request #2504 from space-syndicate/upstream-sync
Upstream sync
|
2024-08-19 17:15:38 +03:00 |
|
|
Morb0
|
8c43b695cb
|
Update locale
|
2024-08-19 10:15:41 +03:00 |
|
|
Morb0
|
3a9aa64863
|
Remove duplicate from diasses emotes
|
2024-08-19 10:11:42 +03:00 |
|
|
Morb0
|
8572f60456
|
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
# Conflicts:
# Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
# Resources/Prototypes/Voice/disease_emotes.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
# Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
# Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
# Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
# Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml
# Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.xml
# Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml
# Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
# Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
# Resources/ServerInfo/Guidebook/Engineering/Fires.xml
# Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml
# Resources/ServerInfo/Guidebook/Engineering/Networking.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Engineering/TEG.xml
# Resources/ServerInfo/Guidebook/Medical/Chemist.xml
# Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml
# Resources/ServerInfo/Guidebook/NewPlayer/CharacterCreation.xml
# Resources/ServerInfo/Guidebook/Science/APE.xml
# Resources/ServerInfo/Guidebook/Security/Forensics.xml
# Resources/ServerInfo/Guidebook/Survival.xml
# 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/Structures/Wallmounts/signs.rsi/meta.json
|
2024-08-19 08:18:59 +03:00 |
|
|
MorbandGitHub
|
4069b50254
|
Update publish-publish.yml
|
2024-08-17 15:31:18 +03:00 |
|
|
MorbandGitHub
|
4d6e3eb02d
|
Update publish-publish.yml
|
2024-08-17 15:12:26 +03:00 |
|
|
MorbandGitHub
|
9dd204e613
|
Merge pull request #2498 from space-syndicate/upstream-sync
Upstream sync
|
2024-08-16 15:51:59 +03:00 |
|
|
Morb0
|
00a2df502b
|
Merge remote-tracking branch 'refs/remotes/syndie/master' into upstream-sync
|
2024-08-16 15:37:18 +03:00 |
|
|
Morb0
|
a0eccf17ec
|
Fix upstream maps
|
2024-08-16 15:35:58 +03:00 |
|
|
Morb0
|
5a59ce650b
|
Update locale
|
2024-08-16 15:32:32 +03:00 |
|
|
Morb0
|
92b31a4f3f
|
Fix upstream
|
2024-08-16 15:05:20 +03:00 |
|
|
Morb0
|
a0bce916fb
|
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
# Conflicts:
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
# Resources/Prototypes/Guidebook/rules.yml
# Resources/Prototypes/Maps/cluster.yml
# Resources/Prototypes/Maps/europa.yml
# Resources/Prototypes/Maps/origin.yml
|
2024-08-16 14:29:08 +03:00 |
|
|
MorbandGitHub
|
d1b37f5bf4
|
Update publish-publish.yml
|
2024-08-13 22:31:51 +03:00 |
|
|
MorbandGitHub
|
42665f4222
|
Merge pull request #2481 from space-syndicate/upstream-sync
Upstream sync
|
2024-08-12 19:14:23 +03:00 |
|
|
Morb0
|
84a13fb57d
|
Update locale
|
2024-08-12 17:44:55 +03:00 |
|
|
Morb0
|
f5f56c1c41
|
Fix upstream
|
2024-08-12 16:31:44 +03:00 |
|
|
Morb0
|
acf1ff4ec0
|
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
# Conflicts:
# Content.Server/Chat/Systems/ChatSystem.cs
# Resources/Prototypes/AlertLevels/alert_levels.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Datasets/Names/fortunes.yml
# Resources/Prototypes/Datasets/ion_storm.yml
# Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
# Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
# Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Recipes/Lathes/clothing.yml
# Resources/Prototypes/StatusIcon/faction.yml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# 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/Head/Helmets/security.rsi/meta.json
# Resources/Textures/Clothing/Mask/joy.rsi/meta.json
# Resources/Textures/Clothing/Mask/squadron.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/produce.png
# Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
# Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png
# Resources/Textures/Objects/Tools/crowbar.rsi/red-storage.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json
|
2024-08-12 13:18:43 +03:00 |
|
|
MorbandGitHub
|
53ed23a533
|
Merge pull request #2466 from space-syndicate/upstream-sync
Upstream sync
|
2024-08-08 02:29:59 +03:00 |
|
|
Morb0
|
a16d31e096
|
Update locale
|
2024-08-08 02:20:30 +03:00 |
|
|
Morb0
|
18681a9887
|
Fix loadout
|
2024-08-08 02:04:19 +03:00 |
|
|
Morb0
|
7990ca8f46
|
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
# Conflicts:
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Entities/Mobs/Player/human.yml
# Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
# Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
# Resources/Prototypes/Roles/Jobs/Command/captain.yml
# Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
# Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
# Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
# Resources/Prototypes/Roles/Jobs/Science/research_director.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
# Resources/Textures/Clothing/Mask/scaredmime.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/winterboots.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/meta.json
|
2024-08-08 01:38:43 +03:00 |
|
|
MorbandGitHub
|
83b07348a6
|
Merge pull request #2446 from space-syndicate/upstream-sync
Upstream sync
|
2024-08-02 21:57:17 +03:00 |
|
|
Morb0
|
c2b5a1315c
|
Update locale
|
2024-08-02 12:32:07 +03:00 |
|
|
MorbandGitHub
|
90ec99e2f1
|
Update publish_github_artifact.py
|
2024-07-31 21:54:01 +03:00 |
|
|
MorbandGitHub
|
6e84b6da01
|
Update publish_github_artifact.py
|
2024-07-29 20:24:36 +03:00 |
|
|
MorbandGitHub
|
936962dddb
|
Use FORK_ID env
|
2024-07-29 07:08:26 +03:00 |
|
|
MorbandGitHub
|
8e1a9679d8
|
Get FORK_ID for publish from env
|
2024-07-29 07:06:28 +03:00 |
|
|
MorbandGitHub
|
9870463071
|
Update publish.yml
|
2024-07-27 23:28:15 +03:00 |
|
|
Morb0
|
740a28c81f
|
Update publish
|
2024-07-21 18:30:03 +03:00 |
|
|
MorbandGitHub
|
81c4f67092
|
Merge pull request #2426 from space-syndicate/upstream-sync
Upstream sync
|
2024-07-21 18:25:42 +03:00 |
|
|
Morb0
|
e6ae8e6e63
|
Fix maps
|
2024-07-21 17:32:55 +03:00 |
|
|
Morb0
|
078e4692df
|
Merge remote-tracking branch 'refs/remotes/syndie/master' into upstream-sync
|
2024-07-21 17:22:44 +03:00 |
|
|
Morb0
|
c7f90ca7d9
|
Fix voice mask
|
2024-07-21 13:18:07 +03:00 |
|
|
Morb0
|
5d7069d1a6
|
Update locale
|
2024-07-21 12:54:42 +03:00 |
|
|
Morb0
|
e853272357
|
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
# Conflicts:
# Content.Client/Power/PowerMonitoringWindow.xaml.cs
# Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
# Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
|
2024-07-21 12:48:56 +03:00 |
|
|
Morb0
|
ad11a22766
|
Update locale
|
2024-07-21 07:47:45 +03:00 |
|
|
Morb0
|
a5980baa7d
|
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
# Conflicts:
# Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
# Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml
# Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry1.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry2.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/court.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/deathsposal.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/doors.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/examroom.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/hydro1.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/hydro2.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/hydro3.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/janitor.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/law.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/signs.rsi/psychology.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/science1.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/science2.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/security.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/space.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio2.png
# Resources/migration.yml
|
2024-07-21 07:20:43 +03:00 |
|
|
MorbandGitHub
|
811626a118
|
Merge pull request #2414 from space-syndicate/upstream-sync
Upstream sync
|
2024-07-14 15:39:49 +03:00 |
|
|
Morb0
|
88e5b8b7c4
|
Fix books
|
2024-07-14 15:05:55 +03:00 |
|
|
Morb0
|
d937534f47
|
Update locale
|
2024-07-14 15:03:53 +03:00 |
|
|
Morb0
|
b143d1d7f7
|
Fix maps
|
2024-07-14 14:57:18 +03:00 |
|
|
Morb0
|
999d01abd3
|
Merge remote-tracking branch 'refs/remotes/syndie/master' into upstream-sync
|
2024-07-14 14:16:48 +03:00 |
|
|
Morb0
|
8ffde2eea4
|
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
# Conflicts:
# .github/workflows/publish.yml
# .github/workflows/test-packaging.yml
# Content.Server/Administration/Systems/AdminSystem.cs
# Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png
# Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png
# Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png
# Tools/gen_build_info.py
|
2024-07-14 12:15:16 +03:00 |
|
|
MorbandGitHub
|
ca60793a10
|
Merge pull request #2401 from space-syndicate/upstream-sync
Upstream sync
|
2024-07-11 16:55:27 +03:00 |
|
|
Morb0
|
c058ea1412
|
Fix maps MachineArtifactAnalyzer rotation
|
2024-07-11 16:37:58 +03:00 |
|
|
Morb0
|
7e0f0d21e5
|
Merge remote-tracking branch 'refs/remotes/syndie/master' into upstream-sync
# Conflicts:
# Resources/Locale/ru-RU/administration/ui/tabs/babyjail-tab.ftl
|
2024-07-11 05:47:32 +03:00 |
|
|
Morb0
|
3bf5e055f2
|
Update locale
|
2024-07-11 05:44:32 +03:00 |
|
|
Morb0
|
7e24238f89
|
Use SpaceLaw book for hyper link
|
2024-07-11 05:37:40 +03:00 |
|
|
Morb0
|
6e2971050e
|
Fix upstream
|
2024-07-11 05:29:18 +03:00 |
|