Merge branch 'refs/heads/master' into tape_player_update

# Conflicts: # Content.Client/_Sunrise/TapePlayer/TapePlayerMenu.xaml # Content.Server/_Sunrise/TapePlayer/TapePlayerSystem.cs # Content.Shared/_Sunrise/TapePlayer/TapePlayerComponent.cs # Resources/Prototypes/Entities/Structures/Machines/jukebox.yml # Resources/Prototypes/_Sunrise/Entities/Objects/Devices/boombox.yml # Resources/Prototypes/_Sunrise/Entities/Objects/Devices/tape_player.yml
space-sunrise · Jun 21, 2024 · f878961 · f878961
2 parents 3669529 + bb47363
commit f878961
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 10 deletions.
diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml
@@ -909,3 +909,15 @@
     type: Tweak
   id: 71
   time: '2024-06-18T00:52:03.334039+00:00'
+- author: VigersRay
+  changes:
+  - message: "\u0413\u0440\u043E\u043C\u043A\u043E\u0441\u0442\u044C \u043C\u0430\u0433\
+      \u043D\u0438\u0442\u043E\u0444\u043E\u043D\u043E\u0432, \u0431\u0443\u043C\u0431\
+      \u043E\u043A\u0441\u043E\u0432 \u0438 \u043C\u0443\u0437\u044B\u043A\u0430\u043B\
+      \u044C\u043D\u043E\u0433\u043E \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0430\
+      \ \u0442\u0435\u043F\u0435\u0440\u044C \u043C\u043E\u0436\u043D\u043E \u0440\
+      \u0435\u0433\u0443\u043B\u0438\u0440\u043E\u0432\u0430\u0442\u044C."
+    type: Tweak
+  id: 72
+  time: '2024-06-18T04:15:51.0000000+00:00'
+  url: https://github.com/space-sunrise/space-station-14/pull/134
diff --git a/.../Backpacks/StarterGear/uplink_catalog.yml → ...Fills/Backpacks/StarterGear/duffelbag.yml b/.../Backpacks/StarterGear/uplink_catalog.yml → ...Fills/Backpacks/StarterGear/duffelbag.yml
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/tapes.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/tapes.yml
@@ -19,5 +19,5 @@
   - type: Sprite
     state: tape1
   - type: MusicTape
-    songName: Sunset by PigeonBeans
+    songName: Sunset by PigeonBeans Sunset by PigeonBeans
     sound: /Audio/_Sunrise/TapePlayer/Tracks/sunset.ogg
diff --git a/Resources/Prototypes/_Sunrise/Maps/box.yml b/Resources/Prototypes/_Sunrise/Maps/box.yml
@@ -2,7 +2,7 @@
   id: SunriseBox
   mapName: 'Box Station'
   mapPath: /Maps/_Sunrise/Station/box.yml
-  minPlayers: 0
+  minPlayers: 30
   stations:
     Boxstation:
       stationProto: StandardNanotrasenStation

diff --git a/Resources/Prototypes/_Sunrise/Maps/cluster.yml b/Resources/Prototypes/_Sunrise/Maps/cluster.yml
@@ -3,7 +3,7 @@
   mapName: 'Cluster'
   mapPath: /Maps/_Sunrise/Station/cluster.yml
   minPlayers: 0
-  maxPlayers: 30
+  maxPlayers: 40
   stations:
     Cluster:
       stationProto: StandardNanotrasenStation

diff --git a/Resources/Prototypes/_Sunrise/Maps/delta.yml b/Resources/Prototypes/_Sunrise/Maps/delta.yml
@@ -2,7 +2,7 @@
   id: SunriseDelta
   mapName: 'Delta Station'
   mapPath: /Maps/_Sunrise/Station/delta.yml
-  minPlayers: 0
+  minPlayers: 40
   stations:
     Delta:
       stationProto: StandardNanotrasenStation

diff --git a/Resources/Prototypes/_Sunrise/Maps/fland.yml b/Resources/Prototypes/_Sunrise/Maps/fland.yml
@@ -2,7 +2,7 @@
   id: SunriseFland
   mapName: 'Fland Installation'
   mapPath: /Maps/_Sunrise/Station/fland.yml
-  minPlayers: 0
+  minPlayers: 40
   stations:
     Fland:
       stationProto: StandardNanotrasenStation

diff --git a/Resources/Prototypes/_Sunrise/Maps/marathon.yml b/Resources/Prototypes/_Sunrise/Maps/marathon.yml
@@ -2,7 +2,7 @@
   id: SunriseMarathon
   mapName: 'Marathon Station'
   mapPath: /Maps/_Sunrise/Station/marathon.yml
-  minPlayers: 0
+  minPlayers: 20
   stations:
     Marathon:
       stationProto: StandardNanotrasenStation

diff --git a/Tools/actions_changelogs_since_last_run.py b/Tools/actions_changelogs_since_last_run.py
@@ -144,23 +144,22 @@ def send_to_discord(entries: Iterable[ChangelogEntry]) -> None:
         print("No discord webhook URL found, skipping discord send")
         return
 
-    content_string = io.StringIO()
-
     for entry in entries:
+        content_string = io.StringIO()
         for change in entry["changes"]:
             emoji = TYPES_TO_EMOJI.get(change['type'], "❓")
             message = change['message']
             content_string.write(f"{emoji} {message}\n")
         url = entry.get("url")
         if url and url.strip():
-            content_string.write(f"[GitHub PR]({url})\n")
+            content_string.write(f"[GitHub Pull Request]({url})\n")
 
         embed = {
             "title": f"Автор: **{entry["author"]}**",
             "description": content_string.getvalue(),
             "color": 0x3498db
         }
-    
+
         if len(content_string.getvalue()) > 0:
             send_embed_discord(embed)