Merge branch 'master' into map-testing

DeltaV-Station · Dec 3, 2024 · 1af8e6e · 1af8e6e
2 parents ea02e3f + fd93054
commit 1af8e6e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -1,10 +1,4 @@
 Entries:
-- author: FluffiestFloof
-  changes:
-  - message: Fixed glimmer mite being extremely loud for some.
-    type: Fix
-  id: 236
-  time: '2024-02-10T23:21:56.0000000+00:00'
 - author: Adrian16199
   changes:
   - message: Added a speech bubble to felinids. Mraow!
@@ -3802,3 +3796,10 @@
   id: 735
   time: '2024-12-02T19:46:17.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2344
+- author: Emily9031
+  changes:
+  - message: The Station AI can now use the Prison and Justice radio channels.
+    type: Fix
+  id: 736
+  time: '2024-12-03T06:36:02.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2352
diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
@@ -16,6 +16,10 @@
     - Security
     - Service
     - Supply
+    # Begin DeltaV additions
+    - Justice
+    - Prison
+    # End DeltaV additions
   - type: ActiveRadio
     channels:
     - Binary
@@ -27,6 +31,10 @@
     - Security
     - Service
     - Supply
+    # Begin DeltaV additions
+    - Justice
+    - Prison
+    # End DeltaV additions
   - type: IgnoreUIRange
   - type: StationAiHeld
   - type: StationAiOverlay