Morb0
|
3cb4017c90
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Audio/Announcements/license.txt
# Resources/Audio/Effects/Shuttle/licenses.txt
# Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
# Resources/Textures/Structures/Storage/tanks.rsi/meta.json
|
2023-11-14 16:35:33 +03:00 |
|
Leon Friedrich
|
654cc7f071
|
Merge ActorSystem and IPlayerManager (#21314)
|
2023-11-11 13:08:10 +11:00 |
|
Morb0
|
611bfea5ff
|
Merge remote-tracking branch 'upstream/master' into update-sposnors
# Conflicts:
# .github/workflows/publish.yml
# Content.Packaging/ContentPackaging.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/GameTicking/GameTicker.StatusShell.cs
# Resources/Audio/Weapons/Guns/Gunshots/license.txt
# Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
# Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closed.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closing.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/open.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/opening.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closing.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/open.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/opening.png
|
2023-11-08 03:00:51 +03:00 |
|
Nemanja
|
4729024d3e
|
Convert ItemSize to prototypes (#21481)
* item sizes are prototypes
* eek
|
2023-11-06 00:20:50 -07:00 |
|
Morb0
|
259233ad78
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Client/Preferences/UI/CharacterSetupGui.xaml
# Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
# Resources/Prototypes/Catalog/Fills/Boxes/general.yml
# Resources/Prototypes/Entities/Clothing/Back/satchel.yml
# Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
|
2023-11-04 12:16:53 +03:00 |
|
Ed
|
e1cd4c4ca1
|
Add Silly station (#1546)
|
2023-11-03 14:43:56 +03:00 |
|
lzk
|
b0f48d486f
|
Deleta Gelta station (#1545)
|
2023-11-02 18:17:54 +03:00 |
|
DrSmugleaf
|
aa0c3b64ea
|
Mark all tests that restart rounds as dirty (#21376)
|
2023-11-01 19:56:07 -07:00 |
|
Nemanja
|
0c329ed661
|
Storage Standardization [Take 2] (#21270)
|
2023-10-30 20:55:55 -07:00 |
|
metalgearsloth
|
5b8f3c48c4
|
Revert "Update submodule to 175.0.0 (#21318)" (#21319)
|
2023-10-29 15:29:30 +11:00 |
|
metalgearsloth
|
9b1b3e03ed
|
Content audio (#20862)
|
2023-10-29 14:58:23 +11:00 |
|
Leon Friedrich
|
f308adffaf
|
Move ActorComponent to shared (#21293)
|
2023-10-29 04:21:02 +11:00 |
|
Morb0
|
681762aca7
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Server/GameTicking/GameTicker.Player.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
# Resources/Prototypes/Objectives/objectiveGroups.yml
|
2023-10-28 14:14:36 +03:00 |
|
Leon Friedrich
|
e685cb626b
|
Un-revert IPlayerManager refactor (#21244)
|
2023-10-28 09:59:53 +11:00 |
|
SyndiCarp
|
7986b33b02
|
Delete Ishimura station (#1528)
|
2023-10-26 11:46:29 +03:00 |
|
metalgearsloth
|
c08349a947
|
Revert "Storage TEST MERGE" (#21258)
|
2023-10-26 00:46:22 -07:00 |
|
Nemanja
|
41795720da
|
[TEST MERGE] Slot-based Storage (#21212)
|
2023-10-25 18:53:38 -04:00 |
|
Leon Friedrich
|
0880145ac8
|
Mind tweaks & fixes (#21203)
|
2023-10-24 10:23:56 -04:00 |
|
metalgearsloth
|
a2bbda43cc
|
Revert "Update submodule to 172.0.0 (#21222)" (#21225)
|
2023-10-24 21:55:20 +11:00 |
|
Leon Friedrich
|
7ba0ea2926
|
IPlayerManager refactor (#21215)
|
2023-10-24 20:19:08 +11:00 |
|
comasqw
|
7d54934496
|
[Maps] Add new Map "Gelta" and Replacing Delta with Gelta (#1518)
|
2023-10-22 19:46:20 +03:00 |
|
Morb0
|
2af666368b
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Server/MassMedia/Systems/NewsSystem.cs
# Resources/Prototypes/Catalog/uplink_catalog.yml
# Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/meta.json
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
|
2023-10-20 01:50:09 +03:00 |
|
DrSmugleaf
|
f560f88eb5
|
Remove 700 usages of Component.Owner (#21100)
|
2023-10-19 12:34:31 -07:00 |
|
Morb0
|
1c61956e31
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/ServerInfo/Guidebook/Science/Science.xml
|
2023-10-18 13:22:26 +03:00 |
|
DrSmugleaf
|
5934c6728f
|
Replace all T : Component constraints with T : IComponent (#21073)
|
2023-10-17 19:42:47 -07:00 |
|
Leon Friedrich
|
00e274ea38
|
Add new entity spawn test & fix misc bugs (#19953)
|
2023-10-16 16:54:10 +11:00 |
|
Morb0
|
55a91108c1
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Server/Chat/Managers/ChatManager.cs
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
# 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
|
2023-10-15 17:52:02 +03:00 |
|
TemporalOroboros
|
0775ab6a14
|
Moves SolutionContainerManagerComponent to Shared. (#20944)
|
2023-10-15 03:45:28 +11:00 |
|
Morb0
|
75443d7fb6
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Server/Communications/CommunicationsConsoleSystem.cs
# README.md
# Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
# Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
# Resources/Prototypes/secret_weights.yml
# 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/librarian.rsi/meta.json
|
2023-10-11 16:56:19 +03:00 |
|
Kara
|
7dd20f7af1
|
Kill ComponentExt (#20907)
|
2023-10-11 20:19:46 +11:00 |
|
DrSmugleaf
|
9bcf67753a
|
Replace string data fields with LocId where relevant (#20883)
|
2023-10-10 23:06:24 -04:00 |
|
metalgearsloth
|
edbfef22d6
|
Climbing refactor (#20516)
|
2023-10-10 16:41:11 -07:00 |
|
DrSmugleaf
|
d9b6f17d50
|
Fix test prototypes fields being marked as unused (#20853)
|
2023-10-09 00:19:32 -07:00 |
|
Leon Friedrich
|
6c0efe6580
|
Fix buckle test but properly this time (#20854)
|
2023-10-09 18:01:45 +11:00 |
|
Leon Friedrich
|
338a415101
|
Try fix buckle test (#20851)
|
2023-10-09 17:35:30 +11:00 |
|
DrSmugleaf
|
a0341ec53e
|
Add test to load all config presets (#20705)
|
2023-10-06 19:31:08 -07:00 |
|
Leon Friedrich
|
427cae2d25
|
Misc mind tweaks and fixes (#20614)
|
2023-10-06 18:00:48 -07:00 |
|
Morb0
|
34a8740819
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# .github/workflows/build-test-release.yml
# Content.Client/Humanoid/HumanoidAppearanceSystem.cs
# Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
|
2023-10-02 02:18:19 +03:00 |
|
Leon Friedrich
|
5164107788
|
Add TestPair.WaitCommand() (#20615)
|
2023-09-30 13:00:20 -07:00 |
|
Morb0
|
64f1e79a5a
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Prototypes/Datasets/tips.yml
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING.png
# Resources/manifest.yml
|
2023-09-28 17:32:44 +03:00 |
|
Leon Friedrich
|
c348582e04
|
Fix thirst errors in tests (#20481)
|
2023-09-24 18:07:31 -07:00 |
|
Morb0
|
13b3bfa217
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# .github/CODEOWNERS
# .github/workflows/update-wiki.yml
# Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
# Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
# Content.Shared/Humanoid/Markings/MarkingPrototype.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
# Resources/ServerInfo/Guidebook/Engineering/AME.xml
# Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
# Resources/manifest.yml
|
2023-09-24 12:56:24 +03:00 |
|
Jezithyr
|
31b2c9f830
|
Refactoring body system to use containers and general body cleanup (#20202)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
|
2023-09-21 17:23:02 +10:00 |
|
Morb0
|
58ef40767e
|
Merge remote-tracking branch 'upstream/master' into upstream-sync2
# Conflicts:
# Content.Client/Entry/EntryPoint.cs
# Content.Client/Preferences/ClientPreferencesManager.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
|
2023-09-19 11:41:15 +03:00 |
|
Leon Friedrich
|
7d9693d976
|
Fix replay recording temporary paths not supporting subdirectories (#19887)
|
2023-09-16 21:46:12 +10:00 |
|
Morb0
|
e21ee44f9e
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# .github/CODEOWNERS
# Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Resources/Prototypes/Datasets/verbs.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
# Resources/Prototypes/Maps/aspid.yml
# Resources/Prototypes/Maps/barratry.yml
# Resources/Prototypes/Maps/cluster.yml
# Resources/Prototypes/Maps/kettle.yml
# Resources/Prototypes/Maps/origin.yml
# Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
|
2023-09-13 16:51:52 +03:00 |
|
Ed
|
1ff24a7ee1
|
New station Gate (#1408)
|
2023-09-13 16:35:01 +03:00 |
|
Ubaser
|
9c2f11d0eb
|
Add map "Europa" (#19930)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
|
2023-09-13 22:22:21 +10:00 |
|
metalgearsloth
|
7dc3347181
|
Fix planet docking (#20104)
|
2023-09-13 22:06:15 +10:00 |
|
metalgearsloth
|
7064f262b4
|
Add ore bag area pickups (#19358)
|
2023-09-12 22:34:04 +10:00 |
|