cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-20 11:35:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

some more globals (#19098)

Browse Source 
* some more globals

* .
This commit is contained in:
Kashargul
2026-01-29 18:21:58 +01:00
committed by GitHub
parent 24e68536bc
commit fdfb49012b
50 changed files with 164 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/marker_beacons.dm
+19 -19
View File
@@ -1,18 +1,18 @@
/*****************Marker Beacons**************************/
var/list/marker_beacon_colors = list(
"Burgundy" = LIGHT_COLOR_FLARE,
"Bronze" = LIGHT_COLOR_ORANGE,
"Yellow" = LIGHT_COLOR_YELLOW,
"Lime" = LIGHT_COLOR_SLIME_LAMP,
"Olive" = LIGHT_COLOR_GREEN,
"Jade" = LIGHT_COLOR_BLUEGREEN,
"Teal" = LIGHT_COLOR_LIGHT_CYAN,
"Cerulean" = LIGHT_COLOR_BLUE,
"Indigo" = LIGHT_COLOR_DARK_BLUE,
"Purple" = LIGHT_COLOR_PURPLE,
"Violet" = LIGHT_COLOR_LAVENDER,
"Fuchsia" = LIGHT_COLOR_PINK
)
GLOBAL_LIST_INIT(marker_beacon_colors, list(
"Burgundy" = LIGHT_COLOR_FLARE,
"Bronze" = LIGHT_COLOR_ORANGE,
"Yellow" = LIGHT_COLOR_YELLOW,
"Lime" = LIGHT_COLOR_SLIME_LAMP,
"Olive" = LIGHT_COLOR_GREEN,
"Jade" = LIGHT_COLOR_BLUEGREEN,
"Teal" = LIGHT_COLOR_LIGHT_CYAN,
"Cerulean" = LIGHT_COLOR_BLUE,
"Indigo" = LIGHT_COLOR_DARK_BLUE,
"Purple" = LIGHT_COLOR_PURPLE,
"Violet" = LIGHT_COLOR_LAVENDER,
"Fuchsia" = LIGHT_COLOR_PINK
))
/obj/item/stack/marker_beacon
name = "marker beacons"
@@ -73,7 +73,7 @@ var/list/marker_beacon_colors = list(
if(!in_range(src, user))
return
var/options = marker_beacon_colors.Copy()
var/options = GLOB.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))
@@ -111,10 +111,10 @@ var/list/marker_beacon_colors = list(
. += span_notice("Alt-click to select a color. Current color is [picked_color].")
/obj/structure/marker_beacon/update_icon()
if(!picked_color || !marker_beacon_colors[picked_color])
picked_color = pick(marker_beacon_colors)
if(!picked_color || !GLOB.marker_beacon_colors[picked_color])
picked_color = pick(GLOB.marker_beacon_colors)
icon_state = "[icon_base][lowertext(picked_color)]-on"
set_light(light_range, light_power, marker_beacon_colors[picked_color])
set_light(light_range, light_power, GLOB.marker_beacon_colors[picked_color])
/obj/structure/marker_beacon/attack_hand(mob/living/user)
if(perma)
@@ -152,7 +152,7 @@ var/list/marker_beacon_colors = list(
if(!in_range(src, user))
return
var/options = marker_beacon_colors.Copy()
var/options = GLOB.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))