Фикс апстримов

Content.Server/Access/Systems/PresetIdCardSystem.cs

@@ -5,6 +5,7 @@ using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
 using Content.Shared.Access.Systems;
 using Content.Shared.Containers.ItemSlots;
+using Content.Shared.GameTicking;
 using Content.Shared.PDA;
 using Content.Shared.Roles;
 using Content.Shared.StatusIcon;

Content.Server/Administration/ServerApi.cs

@@ -843,7 +843,7 @@ public sealed partial class ServerApi : IPostInjectInit
                 return new Actor()
                 {
                     DiscordId = innerActorData.DiscordId,
-                    Record = new(new(Guid.Empty), DateTimeOffset.UnixEpoch, "STUFFBOT", DateTimeOffset.UtcNow, IPAddress.None, []),
+                    Record = new(new(Guid.Empty), DateTimeOffset.UnixEpoch, "STUFFBOT", DateTimeOffset.UtcNow, IPAddress.None, new([], HwidType.Modern)),
                     IsStuffBot = true
                 };
             }

Content.Server/Ghost/GhostSystem.cs

@@ -46,7 +46,6 @@ namespace Content.Server.Ghost
     public sealed class GhostSystem : SharedGhostSystem
     {
         [Dependency] private readonly ActionsSystem _actions = default!;
-        [Dependency] private readonly SharedActionsSystem _actions = default!;
         [Dependency] private readonly IAdminLogManager _adminLog = default!;
         [Dependency] private readonly SharedEyeSystem _eye = default!;
         [Dependency] private readonly FollowerSystem _followerSystem = default!;

Content.Shared.Database/LogType.cs

@@ -126,18 +126,17 @@ public enum LogType
     /// <summary>
     /// A player got hit by an explosion and was dealt damage.
     /// </summary>
-    ExplosionHit = 94,
+    ExplosionHit = 95,
 
     /// <summary>
     /// A ghost warped to an entity through the ghost warp menu.
     /// </summary>
-    GhostWarp = 95,
-    ExplosionHit = 95,
+    GhostWarp = 96,
 
     //WL-Changes-start
     /// <summary>
     /// Успешное обращение к HTTP-api сервера.
     /// </summary>
-    WLHttpApi = 96,
+    WLHttpApi = 97,
     //WL-Changes-end
 }

Content.Shared/Roles/SharedRoleSystem.cs

@@ -23,7 +23,6 @@ public abstract class SharedRoleSystem : EntitySystem
     [Dependency] private readonly IConfigurationManager _cfg = default!;
     [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly SharedGameTicker _gameTicker = default!;
-    [Dependency] private readonly IPrototypeManager _prototypes = default!;
 
     private JobRequirementOverridePrototype? _requirementOverride;
 

Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml

@@ -12,6 +12,7 @@
     - !type:DepartmentTimeRequirement
       department: Engineering
       inverted: true # stop playing intern if you're good at engineering!
+      time: 36000
     - !type:AgeRequirement
       minAge: 20
   startingGear: TechnicalAssistantGear

Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml

@@ -14,11 +14,6 @@
       inverted: true # stop playing intern if you're good at science!
     - !type:AgeRequirement
       minAge: 20
-  requirements:
-    - !type:DepartmentTimeRequirement
-      department: Science
-      time: 36000 #10 hrs # Corvax-RoleTime
-      inverted: true # stop playing intern if you're good at science!
   startingGear: ResearchAssistantGear
   icon: "JobIconResearchAssistant"
   supervisors: job-supervisors-science

Resources/Textures/Clothing/Uniforms/Scrubs/green.rsi/meta.json

@@ -1,11 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-<<<<<<< HEAD
   "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/db81f2e7f584ce6e7c43a5349164b6f4fda335cc, reptilian from Skyrat tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/a6bd62bb09ae4d0785d59a1d882e8048b4b7e987. In hand sprite scaled down by potato1234_x and repalleted by ArRei, derivative monkey made by brainfood1183 (github) for ss14",
-=======
-  "copyright": "Resprited by @mishutka09, derivative monkey made by brainfood1183 (github) for ss14",
->>>>>>> upstream/master
   "size": {
     "x": 32,
     "y": 32
@@ -22,11 +18,6 @@
       "name": "equipped-INNERCLOTHING-monkey",
       "directions": 4
     },
-    {
-      "name": "equipped-INNERCLOTHING-reptilian",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/db81f2e7f584ce6e7c43a5349164b6f4fda335cc, reptilian from Skyrat tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/a6bd62bb09ae4d0785d59a1d882e8048b4b7e987. In hand sprite scaled down by potato1234_x and repalleted by ArRei, derivative monkey made by brainfood1183 (github) for ss14",
-      "directions": 4
-    },
     {
       "name": "equipped-INNERCLOTHING-reptilian",
       "directions": 4

Resources/Textures/Clothing/Uniforms/Scrubs/purple.rsi/meta.json

@@ -1,11 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-<<<<<<< HEAD
   "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/db81f2e7f584ce6e7c43a5349164b6f4fda335cc, reptilian from Skyrat tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/a6bd62bb09ae4d0785d59a1d882e8048b4b7e987. In hand sprite scaled down by potato1234_x, derivative monkey made by brainfood1183 (github) for ss14",
-=======
-  "copyright": "Resprited by @mishutka09, derivative monkey made by brainfood1183 (github) for ss14",
->>>>>>> upstream/master
   "size": {
     "x": 32,
     "y": 32
@@ -22,11 +18,6 @@
       "name": "equipped-INNERCLOTHING-monkey",
       "directions": 4
     },
-    {
-      "name": "equipped-INNERCLOTHING-reptilian",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/db81f2e7f584ce6e7c43a5349164b6f4fda335cc, reptilian from Skyrat tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/a6bd62bb09ae4d0785d59a1d882e8048b4b7e987. In hand sprite scaled down by potato1234_x, derivative monkey made by brainfood1183 (github) for ss14",
-      "directions": 4
-    },
     {
       "name": "equipped-INNERCLOTHING-reptilian",
       "directions": 4

Tools/publish_multi_request.py

@@ -69,7 +69,7 @@ def get_files_to_publish() -> Iterable[str]:
 
 def get_engine_version() -> str:
 ## ToRemove-start
-    return "237.1.0"
+    return "237.2.0"
 ## ToRemove-end
     proc = subprocess.run(["git", "describe","--tags", "--abbrev=0"], stdout=subprocess.PIPE, cwd="RobustToolbox", check=True, encoding="UTF-8")
     tag = proc.stdout.strip()