mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 20:48:56 +01:00
Streamline marker beacons on maps
- A new map only subtype of burgundy marker beacons has been added. - This new subtype is used for the marker beacons on IceBox, which were intended to be red, but were actually picking random colours. - Landing markers on Kilostation are now burgundy marker beacons with different names, rather than anchored marker beacon stacks.
This commit is contained in:
@@ -25,7 +25,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, sortList(list(
|
||||
novariants = TRUE
|
||||
cost = 1
|
||||
source = /datum/robot_energy_storage/beacon
|
||||
var/picked_color = "random"
|
||||
var/picked_color = "Random"
|
||||
|
||||
/obj/item/stack/marker_beacon/ten //miners start with 10 of these
|
||||
amount = 10
|
||||
@@ -79,12 +79,14 @@ GLOBAL_LIST_INIT(marker_beacon_colors, sortList(list(
|
||||
anchored = TRUE
|
||||
light_range = 2
|
||||
light_power = 3
|
||||
var/icon_prefix = "marker"
|
||||
var/remove_speed = 15
|
||||
var/picked_color
|
||||
|
||||
/obj/structure/marker_beacon/Initialize(mapload, set_color)
|
||||
. = ..()
|
||||
picked_color = set_color
|
||||
if(set_color)
|
||||
picked_color = set_color
|
||||
update_icon()
|
||||
|
||||
/obj/structure/marker_beacon/deconstruct(disassembled = TRUE)
|
||||
@@ -101,7 +103,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, sortList(list(
|
||||
/obj/structure/marker_beacon/update_icon()
|
||||
while(!picked_color || !GLOB.marker_beacon_colors[picked_color])
|
||||
picked_color = pick(GLOB.marker_beacon_colors)
|
||||
icon_state = "[initial(icon_state)][lowertext(picked_color)]-on"
|
||||
icon_state = "[icon_prefix][lowertext(picked_color)]-on"
|
||||
set_light(light_range, light_power, GLOB.marker_beacon_colors[picked_color])
|
||||
|
||||
/obj/structure/marker_beacon/attack_hand(mob/living/user)
|
||||
@@ -146,3 +148,11 @@ GLOBAL_LIST_INIT(marker_beacon_colors, sortList(list(
|
||||
if(input_color)
|
||||
picked_color = input_color
|
||||
update_icon()
|
||||
|
||||
|
||||
/* Preset marker beacon types, for mapping */
|
||||
|
||||
/obj/structure/marker_beacon/burgundy
|
||||
picked_color = "Burgundy"
|
||||
// set icon_state to make it clear for mappers
|
||||
icon_state = "markerburgundy-on"
|
||||
|
||||
Reference in New Issue
Block a user