From 1b272fa19d6a9991ce0f9e3b400bd0c73cd2a04f Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Fri, 28 Feb 2025 18:36:04 -0700 Subject: [PATCH] [MIRROR] Marker beacons don't have a 7% chance to go invisible when placed #37 (#10252) Co-authored-by: Cameron Lennox Co-authored-by: Willburd <7099514+Willburd@users.noreply.github.com> --- code/game/objects/items/stacks/marker_beacons.dm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/stacks/marker_beacons.dm b/code/game/objects/items/stacks/marker_beacons.dm index 31dd95baca..2979044ff7 100644 --- a/code/game/objects/items/stacks/marker_beacons.dm +++ b/code/game/objects/items/stacks/marker_beacons.dm @@ -1,6 +1,5 @@ /*****************Marker Beacons**************************/ var/list/marker_beacon_colors = list( -"Random" = FALSE, //not a true color, will pick a random color "Burgundy" = LIGHT_COLOR_FLARE, "Bronze" = LIGHT_COLOR_ORANGE, "Yellow" = LIGHT_COLOR_YELLOW, @@ -69,7 +68,10 @@ var/list/marker_beacon_colors = list( return if(!in_range(src, user)) return - var/input_color = tgui_input_list(user, "Choose a color.", "Beacon Color", marker_beacon_colors) + + var/options = marker_beacon_colors.Copy() + options += list("Random" = FALSE) //not a true color, will pick a random color + var/input_color = tgui_input_list(user, "Choose a color.", "Beacon Color", options) if(user.incapacitated() || !istype(user) || !in_range(src, user)) return if(input_color) @@ -145,7 +147,10 @@ var/list/marker_beacon_colors = list( return if(!in_range(src, user)) return - var/input_color = tgui_input_list(user, "Choose a color.", "Beacon Color", marker_beacon_colors) + + var/options = marker_beacon_colors.Copy() + options += list("Random" = FALSE) //not a true color, will pick a random color + var/input_color = tgui_input_list(user, "Choose a color.", "Beacon Color", options) if(user.incapacitated() || !istype(user) || !in_range(src, user)) return if(input_color)