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 |
|
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 |
|
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 |
|
metalgearsloth
|
46a3076ecb
|
Predict tile-prying (#21167)
|
2023-10-24 00:20:33 +11:00 |
|
DrSmugleaf
|
52e1d64ee2
|
Stop all reads/writes to the admin_log_entity table (#21186)
|
2023-10-22 21:24:03 -07: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 |
|
Kara
|
77964d4a6b
|
Kill SharedEntityExtensions and all popup extensions (#20909)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
|
2023-10-16 16:56:09 +11:00 |
|
Leon Friedrich
|
1f0c9314fd
|
Default warp point names (#21017)
|
2023-10-16 16:39:39 +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 |
|
DrSmugleaf
|
ed15b93926
|
Make starting gear automatically find hands for inhand items (#20861)
|
2023-10-14 10:28:52 -07:00 |
|
TemporalOroboros
|
0775ab6a14
|
Moves SolutionContainerManagerComponent to Shared. (#20944)
|
2023-10-15 03:45:28 +11:00 |
|
Kara
|
546fa44526
|
Kill SharedUnoccludedExtensions (#20914)
|
2023-10-15 03:42:37 +11:00 |
|
DrSmugleaf
|
8639df7a74
|
Add pop sound effect when using the erase admin verb (#20988)
|
2023-10-14 02:53:02 -07:00 |
|
DrSmugleaf
|
f02a54497d
|
Make the panic bunker UI send cvar updates on focus exit, add erase verb tooltip message (#20987)
|
2023-10-14 02:28:08 -07:00 |
|
DrSmugleaf
|
5be0df32ad
|
Add admin Erase verb, add checkbox to erase from the ban panel (#20985)
|
2023-10-14 02:02:56 -07:00 |
|
DrSmugleaf
|
3a2482420f
|
Show total playtime in player list and AHelp window (#20980)
|
2023-10-14 01:55:40 -07:00 |
|
Morb0
|
6f6cbb14af
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
# Content.Client/Changelog/ChangelogManager.cs
# Resources/Prototypes/Voice/disease_emotes.yml
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
# SpaceStation14.sln
|
2023-10-14 00:39:46 +03:00 |
|
DrSmugleaf
|
db4ad40430
|
Add panic bunker UI and automatic panic bunker (#20954)
|
2023-10-13 11:56:12 -07:00 |
|
Morb0
|
5a4438ca85
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.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/secret_weights.yml
# Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/meta.json
# 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/Objects/Misc/bureaucracy.rsi/meta.json
|
2023-10-05 19:37:38 +03:00 |
|
coolmankid12345
|
9df5ded9ad
|
Revolutionaries (#18477)
Co-authored-by: coolmankid12345 <coolmankid12345@users.noreply.github.com>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
|
2023-10-04 18:47:33 -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 |
|
DrSmugleaf
|
f985e7dc5c
|
Fix role unbans not applying in real time (#20547)
|
2023-09-28 16:46:39 -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 |
|
DrSmugleaf
|
81dab12f8a
|
Fix role bans having no confirmation (#20544)
|
2023-09-27 10:27:08 -05: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 |
|
DrSmugleaf
|
71ab660885
|
Add role bans tab to the bans admin window (#20388)
|
2023-09-22 14:08:28 -07:00 |
|
deltanedas
|
37c5020a71
|
move ninja objectives code into generic antag system (#20186)
Co-authored-by: deltanedas <@deltanedas:kde.org>
|
2023-09-21 07:33:18 -07: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
|
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 |
|
metalgearsloth
|
5a0fc68be2
|
Content update for NetEntities (#18935)
|
2023-09-11 09:42:41 +10:00 |
|
deltanedas
|
24810d916b
|
ninja 2 electric boogaloo (#15534)
Co-authored-by: deltanedas <@deltanedas:kde.org>
|
2023-09-10 16:20:27 +10:00 |
|
deltanedas
|
152a1d1e75
|
Make monkeys better (#19407)
Co-authored-by: deltanedas <@deltanedas:kde.org>
|
2023-09-10 12:51:51 +10:00 |
|
Leon Friedrich
|
e4ca6f4fb9
|
Allow solutions to store extra reagent data (#19323)
|
2023-09-05 07:55:10 +10:00 |
|
Morb0
|
b1550d7db0
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# .github/CODEOWNERS
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png
|
2023-09-05 00:12:02 +03:00 |
|
metalgearsloth
|
db1ff07821
|
Weldable cleanup (#19809)
|
2023-09-05 00:07:01 +10:00 |
|
metalgearsloth
|
4cfc578011
|
Revert "Remove most usages of obsolete TransformComponent methods (#1… (#19714)
|
2023-09-01 12:30:29 +10:00 |
|
Morb0
|
5a6058666e
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Client/Entry/EntryPoint.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Resources/Textures/Tiles/dark_mono.png
# Resources/Textures/Tiles/steel_mono.png
# Resources/Textures/Tiles/white_mono.png
|
2023-08-31 20:55:00 +03:00 |
|
DrSmugleaf
|
3f3ba6ac62
|
Move minds, roles, jobs and objectives to shared (#19679)
|
2023-08-30 21:46:11 -07:00 |
|
Morb0
|
2968d856bf
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
|
2023-08-30 20:42:46 +03:00 |
|
Visne
|
1416942bea
|
Remove most usages of obsolete TransformComponent methods (#19571)
|
2023-08-30 12:05:19 +10:00 |
|
Morb0
|
1b513f0c1a
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# .github/workflows/publish.yml
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Server/Zombies/ZombieSystem.Transform.cs
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Maps/box.yml
# Resources/Prototypes/Maps/fland.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Textures/Tiles/attributions.yml
|
2023-08-29 05:58:14 +03:00 |
|
DrSmugleaf
|
15c0211fb2
|
Refactor minds to be entities with components, make roles components (#19591)
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
|
2023-08-28 16:53:24 -07:00 |
|