From 69e7ada387f0864668abc8ffc324ebb1bbedd468 Mon Sep 17 00:00:00 2001
From: ZomgPonies <lorden@zomgponies.com>
Date: Thu, 18 Jun 2020 12:57:07 -0400
Subject: [PATCH] Map and icon fixes

---
 _maps/map_files/cyberiad/cyberiad.dmm   | 20 +++++++++++++-------
 code/modules/paperwork/ticketmachine.dm |  4 ++--
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
index 80c5da54103..3909332ffa6 100644
--- a/_maps/map_files/cyberiad/cyberiad.dmm
+++ b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -49915,10 +49915,14 @@
 	pixel_y = 25;
 	req_access_txt = "28"
 	},
-/obj/machinery/ticket_machine_button{
+/obj/machinery/light_switch{
 	pixel_x = -4;
 	pixel_y = 36
 	},
+/obj/machinery/ticket_machine_button{
+	pixel_x = -22;
+	pixel_y = 4
+	},
 /turf/simulated/floor/plasteel{
 	dir = 9;
 	icon_state = "blue"
@@ -49947,10 +49951,6 @@
 	pixel_x = 0;
 	pixel_y = 30
 	},
-/obj/machinery/light_switch{
-	pixel_x = 10;
-	pixel_y = 34
-	},
 /turf/simulated/floor/plasteel,
 /area/crew_quarters/heads)
 "bOD" = (
@@ -55015,6 +55015,10 @@
 	icon_state = "4";
 	dir = 4
 	},
+/obj/machinery/ticket_machine{
+	layer = 4;
+	pixel_y = 32
+	},
 /turf/simulated/floor/plasteel,
 /area/hallway/primary/central/sw)
 "bWT" = (
@@ -57324,9 +57328,11 @@
 	})
 "caw" = (
 /obj/structure/disposalpipe/segment,
-/obj/machinery/ticket_machine{
+/obj/machinery/status_display{
+	density = 0;
 	layer = 4;
-	pixel_x = 32
+	pixel_x = 32;
+	pixel_y = 0
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
diff --git a/code/modules/paperwork/ticketmachine.dm b/code/modules/paperwork/ticketmachine.dm
index 4895639bc81..7af0a038006 100644
--- a/code/modules/paperwork/ticketmachine.dm
+++ b/code/modules/paperwork/ticketmachine.dm
@@ -67,8 +67,8 @@
 /obj/machinery/ticket_machine_button
 	name = "increment ticket counter"
 	desc = "Use this button after you've served someone to tell the next person to come forward."
-	icon = 'icons/obj/power.dmi'
-	icon_state = "crema_switch"
+	icon = 'icons/obj/objects.dmi'
+	icon_state = "launcherbtt"
 	req_access = list()
 	var/id = 1
 	var/cooldown = FALSE