Merge branch 'master' into dr-gibb-blood-red

DeltaV-Station · Nov 21, 2024 · 34d4172 · 34d4172
2 parents a54fef9 + 39e5b76
commit 34d4172
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -1,10 +1,4 @@
 Entries:
-- author: ps3moira
-  changes:
-  - message: Reverted Shotgun sprites
-    type: Tweak
-  id: 195
-  time: '2024-01-01T21:48:08.0000000+00:00'
 - author: Velcroboy
   changes:
   - message: Added BB guns! Don't shoot your eye out.
@@ -3748,3 +3742,10 @@
   id: 694
   time: '2024-11-21T04:28:40.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2249
+- author: Radezolid
+  changes:
+  - message: Removed the war declarator from the nuclear operatives.
+    type: Remove
+  id: 695
+  time: '2024-11-21T08:26:50.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2207
diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml
@@ -85,8 +85,8 @@
   equipment:
     neck: SyndicateWhistle
     outerClothing: ClothingOuterHardsuitSyndieCommander
-  inhand:
-  - NukeOpsDeclarationOfWar
+#  inhand: # DeltaV - Removal Of War.
+#  - NukeOpsDeclarationOfWar
 
 #Nuclear Operative Medic Gear
 - type: startingGear