From 6d5decfaf438f654cf7ed8d11a81c27272639fc6 Mon Sep 17 00:00:00 2001
From: Runa Dacino <dacinoorder@gmail.com>
Date: Mon, 5 Sep 2022 11:31:57 +0200
Subject: [PATCH 1/2] Adds security newscasters to security

Fixes
https://github.com/VOREStation/VOREStation/issues/13378

added to:

* Security Briefing Room
* Security Lobby
* Warden's Office
* Security Processing
* Detective's Office
* Head of Security's Office
---
 maps/groundbase/gb-z1.dmm | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm
index 8428febf7f4..63c80d7b176 100644
--- a/maps/groundbase/gb-z1.dmm
+++ b/maps/groundbase/gb-z1.dmm
@@ -3624,6 +3624,9 @@
 	dir = 4
 	},
 /obj/machinery/light,
+/obj/machinery/newscaster/security_unit{
+	pixel_x = -27
+	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/hos)
 "ie" = (
@@ -10001,6 +10004,9 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
 	},
+/obj/machinery/newscaster/security_unit{
+	pixel_y = -28
+	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/lobby)
 "xc" = (
@@ -16031,6 +16037,12 @@
 	},
 /turf/simulated/floor,
 /area/groundbase/medical/office)
+"LZ" = (
+/obj/machinery/newscaster/security_unit{
+	pixel_x = -27
+	},
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/security/detective)
 "Ma" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 8
@@ -16577,6 +16589,12 @@
 	},
 /turf/simulated/wall/r_wall,
 /area/groundbase/engineering/eva)
+"Nn" = (
+/obj/machinery/newscaster/security_unit{
+	pixel_y = -28
+	},
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/security/warden)
 "No" = (
 /obj/machinery/computer/med_data/laptop{
 	dir = 8
@@ -18379,6 +18397,12 @@
 /obj/effect/landmark/vermin,
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/bar)
+"Sb" = (
+/obj/machinery/newscaster/security_unit{
+	pixel_x = 27
+	},
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/security/briefing)
 "Sc" = (
 /obj/machinery/camera/network/command{
 	dir = 4
@@ -18508,6 +18532,9 @@
 /obj/item/device/taperecorder,
 /obj/item/device/retail_scanner/security,
 /obj/item/device/camera,
+/obj/machinery/newscaster/security_unit{
+	pixel_y = -29
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/security/processing)
 "Ss" = (
@@ -26679,7 +26706,7 @@ Nu
 AZ
 cv
 px
-AN
+Sb
 fY
 SR
 AN
@@ -27120,7 +27147,7 @@ Jp
 zg
 mi
 VV
-Pl
+Nn
 qa
 zK
 uc
@@ -29797,7 +29824,7 @@ cB
 cB
 yb
 FD
-Uz
+LZ
 vR
 yL
 tg

From 8ac619ded057b4bf5b2209c934f710b8691e650d Mon Sep 17 00:00:00 2001
From: Runa Dacino <dacinoorder@gmail.com>
Date: Mon, 5 Sep 2022 11:39:44 +0200
Subject: [PATCH 2/2] Adds missing retail scanners

Fixes https://github.com/VOREStation/VOREStation/issues/13666 and more

While adding missing cargo retail scanner, I noticed it was also missing from the library and medical. I also remembered there being no scanners on the bridge either, while there may be reasons for bridge crew to need one.

Library one was added to librarian's office,

cargo one is out in the open by the fax

Medical one is by the suit sensors monitors

Command one is in the meeting room
---
 maps/groundbase/gb-z2.dmm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/maps/groundbase/gb-z2.dmm b/maps/groundbase/gb-z2.dmm
index be25bf67da6..eb11bf89245 100644
--- a/maps/groundbase/gb-z2.dmm
+++ b/maps/groundbase/gb-z2.dmm
@@ -934,6 +934,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
+/obj/item/device/retail_scanner/cargo,
 /turf/simulated/floor/tiled,
 /area/groundbase/cargo/office)
 "cs" = (
@@ -2747,6 +2748,7 @@
 /obj/machinery/firealarm{
 	dir = 4
 	},
+/obj/item/device/retail_scanner/medical,
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/lobby)
 "hL" = (
@@ -3303,6 +3305,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
 	},
+/obj/item/device/retail_scanner/civilian,
 /turf/simulated/floor/carpet,
 /area/groundbase/civilian/library)
 "jn" = (
@@ -5271,6 +5274,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/item/device/retail_scanner/command,
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/command/meeting)
 "pn" = (