From 09f8acb34bcd7e244ecb6a6a9f4189562914522e Mon Sep 17 00:00:00 2001
From: TheDanseMacabre <57339900+TheDanseMacabre@users.noreply.github.com>
Date: Sat, 2 Jul 2022 06:27:13 -0400
Subject: [PATCH] CE, CMO, OM, and RD all get mini-disruptors. (#14373)

---
 .../crates_lockers/closets/secure/cargo.dm    |  1 +
 .../closets/secure/engineering.dm             |  1 +
 .../crates_lockers/closets/secure/medical.dm  |  1 +
 .../closets/secure/scientist.dm               |  1 +
 html/changelogs/dansemacabre-patriotism.yml   | 41 +++++++++++++++++++
 5 files changed, 45 insertions(+)
 create mode 100644 html/changelogs/dansemacabre-patriotism.yml

diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
index 8b3f49f51ac..84aa4c1a1e7 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
@@ -40,6 +40,7 @@
 	new /obj/item/device/megaphone/cargo(src)
 	new /obj/item/storage/box/goldstar(src)
 	new /obj/item/device/flashlight/marshallingwand(src)
+	new /obj/item/gun/energy/disruptorpistol/miniature(src)
 
 /obj/structure/closet/secure_closet/merchant
 	name = "merchant locker"
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
index 1f81f3a8e11..c075d778357 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
@@ -31,6 +31,7 @@
 	new /obj/item/clothing/accessory/storage/overalls/chief(src)
 	new /obj/item/rfd/piping(src)
 	new /obj/item/storage/box/fancy/keypouch/eng(src)
+	new /obj/item/gun/energy/disruptorpistol/miniature(src)
 
 /obj/structure/closet/secure_closet/engineering_chief2
 	name = "chief engineer's attire"
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
index 3ab4e0b9f0b..2a376b388ad 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -136,6 +136,7 @@
 	new /obj/item/clothing/glasses/hud/health/aviator(src)
 	new /obj/item/storage/box/fancy/keypouch/med(src)
 	new /obj/item/device/advanced_healthanalyzer(src)
+	new /obj/item/gun/energy/disruptorpistol/miniature(src)
 
 /obj/structure/closet/secure_closet/CMO2
 	name = "chief medical officer's attire"
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
index 6763a8a1a9b..cfff8ecbd8d 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
@@ -36,6 +36,7 @@
 	new /obj/item/storage/box/fancy/keypouch/sci(src)
 	new /obj/item/storage/box/tethers(src)
 	new /obj/item/taperoll/science(src)
+	new /obj/item/gun/energy/disruptorpistol/miniature(src)
 
 /obj/structure/closet/secure_closet/RD2
 	name = "research director's attire"
diff --git a/html/changelogs/dansemacabre-patriotism.yml b/html/changelogs/dansemacabre-patriotism.yml
new file mode 100644
index 00000000000..452782ee9d7
--- /dev/null
+++ b/html/changelogs/dansemacabre-patriotism.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: TheDanseMacabre
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - rscadd: "The CMO, CE, RD, and OM now all have miniature disruptors in their lockers."