From 2dbff65258cc0db3a704d4f72f40fe30bf59f8ca Mon Sep 17 00:00:00 2001
From: Contrabang <91113370+Contrabang@users.noreply.github.com>
Date: Thu, 23 Jun 2022 09:46:13 -0700
Subject: [PATCH] Removes syringe guns, into the CMO locker (#18062)

---
 _maps/map_files/Delta/delta.dmm                              | 2 --
 _maps/map_files/MetaStation/MetaStation.dmm                  | 5 -----
 _maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm      | 1 -
 _maps/map_files/cyberiad/cyberiad.dmm                        | 5 -----
 .../structures/crates_lockers/closets/secure/medical.dm      | 1 +
 5 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
index 034065b9fc0..d2195542e43 100644
--- a/_maps/map_files/Delta/delta.dmm
+++ b/_maps/map_files/Delta/delta.dmm
@@ -62344,7 +62344,6 @@
 	pixel_y = 5
 	},
 /obj/item/storage/box/syringes,
-/obj/item/gun/syringe,
 /obj/machinery/status_display{
 	pixel_x = -32
 	},
@@ -87485,7 +87484,6 @@
 "dXZ" = (
 /obj/structure/table/reinforced,
 /obj/structure/bedsheetbin,
-/obj/item/gun/syringe,
 /obj/machinery/light/small,
 /turf/simulated/floor/plasteel,
 /area/medical/surgery)
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 1976f8e6e01..98cfc42b0db 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -42479,11 +42479,6 @@
 	pixel_x = 6;
 	pixel_y = -6
 	},
-/obj/item/gun/syringe,
-/obj/item/gun/syringe{
-	pixel_x = 3;
-	pixel_y = -3
-	},
 /obj/machinery/light{
 	dir = 1
 	},
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm
index 11b243a5745..b175cb6b594 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm
@@ -406,7 +406,6 @@
 /area/ruin/unpowered)
 "aW" = (
 /obj/structure/table/reinforced,
-/obj/item/gun/syringe,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
index 62887c7c7c4..993bba04e52 100644
--- a/_maps/map_files/cyberiad/cyberiad.dmm
+++ b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -41836,11 +41836,6 @@
 	pixel_y = -24
 	},
 /obj/structure/cable,
-/obj/item/gun/syringe,
-/obj/item/gun/syringe{
-	pixel_x = 3;
-	pixel_y = -3
-	},
 /turf/simulated/floor/plasteel{
 	icon_state = "whitebluefull"
 	},
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 632e0ade1b2..1292b6d93af 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -166,6 +166,7 @@
 	new /obj/item/handheld_defibrillator(src)
 	new /obj/item/storage/belt/medical(src)
 	new /obj/item/flash(src)
+	new /obj/item/gun/syringe(src)
 	new /obj/item/reagent_containers/hypospray/CMO(src)
 	new /obj/item/organ/internal/cyberimp/eyes/hud/medical(src)
 	new /obj/item/door_remote/chief_medical_officer(src)