From 25623fdbd50384e710063d1142af080f0e46bb60 Mon Sep 17 00:00:00 2001
From: Alberyk <Alberyk@users.noreply.github.com>
Date: Mon, 27 Nov 2017 19:33:18 -0200
Subject: [PATCH] More nerfs for the nerf god (#3878)

-removes the shotgun slugs and shells from the armory's lockers:
https://forums.aurorastation.org/viewtopic.php?f=18&t=9567
https://forums.aurorastation.org/viewtopic.php?f=18&t=9527

Removes thermal and combat injector from the vault, replacing them with other modules.
---
 maps/aurora/aurora-3_sublevel.dmm  |  5 ++--
 maps/aurora/aurora-4_mainlevel.dmm | 44 ++++++++++--------------------
 2 files changed, 16 insertions(+), 33 deletions(-)

diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm
index deaac1bbacb..42ca83842fb 100644
--- a/maps/aurora/aurora-3_sublevel.dmm
+++ b/maps/aurora/aurora-3_sublevel.dmm
@@ -1,5 +1,4 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-//Model dictionary trimmed on: 18-11-2017 20:57 (UTC)
 "aa" = (
 /turf/unsimulated/chasm_mask,
 /area/mine/unexplored)
@@ -9108,11 +9107,11 @@
 /turf/simulated/open,
 /area/maintenance/sublevel)
 "qI" = (
-/obj/item/rig_module/vision/thermal,
 /obj/structure/table/reinforced,
 /obj/structure/window/reinforced{
 	dir = 1
 	},
+/obj/item/rig_module/vision/nvg,
 /turf/simulated/floor/plating,
 /area/security/nuke_storage)
 "qJ" = (
@@ -9149,11 +9148,11 @@
 /turf/simulated/floor/plating,
 /area/security/nuke_storage)
 "qL" = (
-/obj/item/rig_module/chem_dispenser/combat,
 /obj/structure/table/reinforced,
 /obj/structure/window/reinforced{
 	dir = 1
 	},
+/obj/item/rig_module/chem_dispenser/injector,
 /turf/simulated/floor/plating,
 /area/security/nuke_storage)
 "qM" = (
diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm
index a4a1192c44f..6632af11f3d 100644
--- a/maps/aurora/aurora-4_mainlevel.dmm
+++ b/maps/aurora/aurora-4_mainlevel.dmm
@@ -8915,9 +8915,22 @@
 /area/security/armoury)
 "arh" = (
 /obj/structure/closet/secure_closet/guncabinet{
-	name = "Ammunition (Less-than-lethal)"
+	name = "Ammunition (45. less-than-lethal)"
 	},
 /obj/effect/decal/warning_stripes,
+/obj/item/ammo_magazine/c45m/rubber,
+/obj/item/ammo_magazine/c45m/rubber,
+/obj/item/ammo_magazine/c45m/rubber,
+/obj/item/ammo_magazine/c45m/rubber,
+/obj/item/ammo_magazine/c45m/rubber,
+/turf/simulated/floor/tiled/dark,
+/area/security/armoury)
+"ari" = (
+/obj/structure/closet/secure_closet/guncabinet{
+	name = "Ammunition (shotgun less-than-lethal)"
+	},
+/obj/effect/decal/warning_stripes,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/item/weapon/storage/box/stunshells,
 /obj/item/weapon/storage/box/flashshells{
 	pixel_x = -2;
@@ -8931,35 +8944,6 @@
 	pixel_x = -4;
 	pixel_y = 4
 	},
-/obj/item/ammo_magazine/c45m/rubber,
-/obj/item/ammo_magazine/c45m/rubber,
-/obj/item/ammo_magazine/c45m/rubber,
-/obj/item/ammo_magazine/c45m/rubber,
-/obj/item/ammo_magazine/c45m/rubber,
-/turf/simulated/floor/tiled/dark,
-/area/security/armoury)
-"ari" = (
-/obj/structure/closet/secure_closet/guncabinet{
-	name = "Ammunition (Shotgun lethal)"
-	},
-/obj/effect/decal/warning_stripes,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/item/weapon/storage/box/shotgunshells{
-	pixel_x = 4;
-	pixel_y = -4
-	},
-/obj/item/weapon/storage/box/shotgunshells{
-	pixel_x = 4;
-	pixel_y = -4
-	},
-/obj/item/weapon/storage/box/shotgunammo{
-	pixel_x = 2;
-	pixel_y = -2
-	},
-/obj/item/weapon/storage/box/shotgunammo{
-	pixel_x = 2;
-	pixel_y = -2
-	},
 /turf/simulated/floor/tiled/dark,
 /area/security/armoury)
 "arj" = (