From 0dfd804e17bed736c5b725bd2fea2acc6f383a71 Mon Sep 17 00:00:00 2001
From: Waterpig <49160555+Majkl-J@users.noreply.github.com>
Date: Sun, 19 Nov 2023 19:11:09 +0100
Subject: [PATCH] [MODULAR - BLOAT EDITION] The dauntless ammo locker now
 actually has the correct ammo types (#733)

---
 .../bubberstation/lavaland_dauntless.dmm       |  2 +-
 .../maps/offstation/dauntless/areas.dm         |  2 +-
 .../maps/offstation/dauntless/security.dm      | 18 ++++++++++++++++++
 tgstation.dme                                  |  1 +
 4 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 modular_zubbers/maps/offstation/dauntless/security.dm

diff --git a/_maps/RandomRuins/LavaRuins/bubberstation/lavaland_dauntless.dmm b/_maps/RandomRuins/LavaRuins/bubberstation/lavaland_dauntless.dmm
index e787ff0114c..eeec9694f5e 100644
--- a/_maps/RandomRuins/LavaRuins/bubberstation/lavaland_dauntless.dmm
+++ b/_maps/RandomRuins/LavaRuins/bubberstation/lavaland_dauntless.dmm
@@ -2703,8 +2703,8 @@
 /turf/open/floor/wood/tile,
 /area/ruin/space/has_grav/bubbers/dauntless/service/diner)
 "po" = (
-/obj/structure/closet/secure_closet/interdynefob/munitions_locker,
 /obj/structure/cable,
+/obj/structure/closet/secure_closet/dauntless/munitions_locker,
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/space/has_grav/bubbers/dauntless/sec/armory)
 "pq" = (
diff --git a/modular_zubbers/maps/offstation/dauntless/areas.dm b/modular_zubbers/maps/offstation/dauntless/areas.dm
index af1fbde3660..0421128db33 100644
--- a/modular_zubbers/maps/offstation/dauntless/areas.dm
+++ b/modular_zubbers/maps/offstation/dauntless/areas.dm
@@ -8,7 +8,7 @@
 // Cargo
 
 /area/ruin/space/has_grav/bubbers/dauntless/cargo
-	name = "Dauntless Hangerbay"
+	name = "Dauntless Hangarbay"
 
 // Engineering
 
diff --git a/modular_zubbers/maps/offstation/dauntless/security.dm b/modular_zubbers/maps/offstation/dauntless/security.dm
new file mode 100644
index 00000000000..5ddd0d61274
--- /dev/null
+++ b/modular_zubbers/maps/offstation/dauntless/security.dm
@@ -0,0 +1,18 @@
+/obj/structure/closet/secure_closet/dauntless/munitions_locker
+	anchored = 1;
+	icon = 'modular_skyrat/master_files/icons/obj/closet.dmi'
+	icon_door = "riot"
+	icon_state = "riot"
+	name = "armory munitions locker"
+
+/obj/structure/closet/secure_closet/dauntless/munitions_locker/PopulateContents()
+	..()
+
+	generate_items_inside(list(
+		/obj/item/ammo_box/magazine/m9mm = 6,
+		/obj/item/ammo_box/magazine/m9mm/fire = 2,
+		/obj/item/ammo_box/advanced/s12gauge/buckshot = 1,
+		/obj/item/ammo_box/advanced/s12gauge = 2,
+		/obj/item/ammo_box/advanced/s12gauge/rubber = 2,
+		/obj/item/ammo_box/magazine/sniper_rounds/soporific = 2,
+	), src)
diff --git a/tgstation.dme b/tgstation.dme
index 7bd8e4ea673..f2be07fa73b 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -8087,6 +8087,7 @@
 #include "modular_zubbers\maps\offstation\dauntless\laws.dm"
 #include "modular_zubbers\maps\offstation\dauntless\mob_spawns.dm"
 #include "modular_zubbers\maps\offstation\dauntless\robot.dm"
+#include "modular_zubbers\maps\offstation\dauntless\security.dm"
 #include "modular_zubbers\master_files\code\modules\client\preferences\hypnopref.dm"
 #include "modular_zubbers\master_files\code\modules\client\preferences\obscurity_examine.dm"
 #include "modular_zubbers\master_files\code\modules\research\designs\biogenerator_designs.dm"