diff --git a/code/modules/paperwork/ticketmachine.dm b/code/modules/paperwork/ticketmachine.dm index 83fa81e198c..22dd1d81d22 100644 --- a/code/modules/paperwork/ticketmachine.dm +++ b/code/modules/paperwork/ticketmachine.dm @@ -21,7 +21,8 @@ var/list/ticket_holders = list() var/list/tickets = list() var/id = 1 - var/dispense_enabled = TRUE //used to ID card disable/enable ticket dispensing + /// If FALSE, the ticket machine will not dispense tickets. Toggled by swiping aHoP ID + var/dispense_enabled = TRUE /obj/machinery/ticket_machine/Destroy() for(var/obj/item/ticket_machine_ticket/ticket in tickets) @@ -104,17 +105,17 @@ /obj/machinery/ticket_machine/proc/handle_maptext() if(!dispense_enabled) - maptext_x = 13 - maptext = "X" - else - switch(ticket_number) //This is here to handle maptext offsets so that the numbers align. - if(0 to 9) - maptext_x = 13 - if(10 to 99) - maptext_x = 10 - if(100) - maptext_x = 8 - maptext = "[ticket_number]" + maptext_x = 6 + maptext = "OFF" + return + switch(ticket_number) //This is here to handle maptext offsets so that the numbers align. + if(0 to 9) + maptext_x = 13 + if(10 to 99) + maptext_x = 10 + if(100) + maptext_x = 8 + maptext = "[ticket_number]" /obj/machinery/ticket_machine/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/hand_labeler_refill)) @@ -139,13 +140,12 @@ var/obj/item/card/id/heldID = I if(ACCESS_HOP in heldID.access) dispense_enabled = !dispense_enabled - to_chat(user, "You [dispense_enabled ? "enable" : "disable"] the ticket machine, it will [dispense_enabled ? "now" : "no longer"] dispense tickets!") + to_chat(user, "You [dispense_enabled ? "enable" : "disable"] [src], it will [dispense_enabled ? "now" : "no longer"] dispense tickets!") handle_maptext() return - else - to_chat(user, "You do not have the required access to [dispense_enabled ? "disable" : "enable"] the ticket machine.") - else - return ..() + to_chat(user, "You do not have the required access to [dispense_enabled ? "disable" : "enable"] the ticket machine.") + return + return ..() /obj/machinery/ticket_machine/proc/reset_cooldown() ready = TRUE @@ -156,7 +156,7 @@ to_chat(user,"You press the button, but nothing happens...") return if(!dispense_enabled) - to_chat(user, "The ticket machine is disabled.") + to_chat(user, "[src] is disabled.") return if(ticket_number >= max_number) to_chat(user,"Ticket supply depleted, please refill this unit with a hand labeller refill cartridge!") @@ -191,7 +191,7 @@ /obj/machinery/ticket_machine/examine(mob/user) . = ..() - . += "Use an ID card with HOP access on this machine to [dispense_enabled ? "disable" : "enable"] ticket dispensing." + . += "Use an ID card with Head of Personnel access on this machine to [dispense_enabled ? "disable" : "enable"] ticket dispensing." /obj/item/ticket_machine_ticket name = "Ticket"