English OBT + Bugfixes (#1029)

* ts

* Test - without spawning at all

* Update coffin.yml

* Update CP14UniqueLootSystem.cs

Content.Server/_CP14/RoundEnd/CP14RoundEndSystem.CBT.cs

@@ -50,11 +50,6 @@ public sealed partial class CP14RoundEndSystem
                 _ticker.TogglePause();
         }
 
-        if (nowMoscow.Hour == 17 && nowMoscow.Minute == 45)
-        {
-            _consoleHost.ExecuteCommand("shutdown"); //Restart server, load updates and other
-        }
-
         if (nowMoscow.Hour == 20 && nowMoscow.Minute == 45)
         {
             _chatSystem.DispatchGlobalAnnouncement("ВНИМАНИЕ: Сервер автоматически завершит раунд через 15 минут", announcementSound: new SoundPathSpecifier("/Audio/Effects/beep1.ogg"), sender: "Сервер");

Content.Server/_CP14/UniqueLoot/CP14UniqueLootSystem.cs

@@ -32,8 +32,12 @@ public sealed partial class CP14UniqueLootSystem : EntitySystem
         if (loot == null)
             return;
 
-        if (!Deleted(ent))
-            SpawnAtPosition(loot, Transform(ent).Coordinates);
+        if (TerminatingOrDeleted(ent) || !Exists(ent))
+            return;
+
+        var coords = Transform(ent).Coordinates;
+
+        EntityManager.SpawnEntity(loot, coords);
     }
 
 

Content.Shared/Localizations/ContentLocalizationManager.cs

@@ -10,8 +10,8 @@ namespace Content.Shared.Localizations
         [Dependency] private readonly ILocalizationManager _loc = default!;
 
         // If you want to change your codebase's language, do it here.
-        //public const string Culture = "en-US";
-        public const string Culture = "ru-RU";
+        public const string Culture = "en-US";
+        //public const string Culture = "ru-RU";
 
         /// <summary>
         /// Custom format strings used for parsing and displaying minutes:seconds timespans.
@@ -29,9 +29,9 @@ namespace Content.Shared.Localizations
             var culture = new CultureInfo(Culture);
             _loc.LoadCulture(culture);
             // Uncomment for Ru localization
-            var fallbackCulture = new CultureInfo("en-US");
-            _loc.LoadCulture(fallbackCulture);
-            _loc.SetFallbackCluture(fallbackCulture);
+            //var fallbackCulture = new CultureInfo("en-US");
+            //_loc.LoadCulture(fallbackCulture);
+            //_loc.SetFallbackCluture(fallbackCulture);
             //
 
             _loc.AddFunction(culture, "PRESSURE", FormatPressure);

Resources/ConfigPresets/_CP14/Dev.toml

@@ -1,5 +1,5 @@
 [whitelist]
-enabled = true
+enabled = false
 
 [log]
 path = "logs"
@@ -14,13 +14,13 @@ bindto = "::,0.0.0.0"
 max_connections = 100
 
 [game]
-hostname = "⚔️  CrystallEdge Alpha [RU] ⚔️ Status: Whitelist only"
+hostname = "⚔️  CrystallEdge [EN] ⚔️ Status: Open Playtest"
 desc = "History of the City of Sword and Magic. A social economic sandbox reinventing the Space Station 14 concept in fantasy style"
 lobbyenabled = true
 soft_max_players = 40
 maxplayers = 80
 lobbyduration = 300
-role_timers = true
+role_timers = false
 
 [server]
 rules_file = "CP14SandboxRU"
@@ -61,4 +61,4 @@ enable_during_round = true
 
 [cp14]
 discord_auth_enabled = true
-closet_beta_test = true
+closet_beta_test = false

Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/coffin.yml

@@ -32,8 +32,8 @@
       - !type:SpawnEntitiesBehavior
         spawn:
           CP14WoodenPlanks1:
-            min: 1
-            max: 4
+            min: 2
+            max: 3
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: Construction

Resources/Prototypes/_CP14/ModularCraft/Blade/dagger.yml

@@ -24,6 +24,10 @@
       types:
         Slash: 4
         Piercing: 3
+  - !type:EditIncreaseDamageOnWield
+    bonusDamage:
+      types:
+        Piercing: 3
   - !type:EditItem
     newSize: Normal
     adjustShape: 0, 1

Resources/Prototypes/_CP14/ModularCraft/Blade/sickle.yml

@@ -1,6 +1,5 @@
 #Concept:
-# Copy of dagger with lesser damage
-# But can gather grass from world
+# Copy of dagger with bigger damage, but without throwing
 - type: modularPart
   id: BaseBladeSickle
   modifiers:
@@ -13,7 +12,11 @@
     attackRateMultiplier: 1.5
     bonusDamage:
       types:
-        Slash: 4
+        Slash: 8
+  - !type:EditIncreaseDamageOnWield
+    bonusDamage:
+      types:
+        Slash: 3
   - !type:EditItem
     newSize: Normal
     adjustShape: 0, 1

Resources/Prototypes/_CP14/Roles/Antags/vampire.yml

@@ -2,7 +2,7 @@
   id: CP14Vampire
   name: cp14-roles-antag-vampire-name
   antagonist: true
-  setPreference: true
+  setPreference: false #Impossible and boring gameplay ATM
   objective: cp14-roles-antag-vampire-objective
   requirements:
   - !type:OverallPlaytimeRequirement