Mapping Marker Markets - They're All In Now (#66736)

bout The Pull Request

Hey there,

We had a lot of marker colors previously locked behind the in-game "random marker" mechanic that mappers couldn't really use since you'd have to varedit those shits. Now, instead of just... Burgundy, we now have:

Bronze!
Yellow!
Lime!
Olive!
Jade!
Teal!
Cerulean!
Indigo!
Purple!
Violet!
Fuschia!

All for your mapping enjoyment.

There were also a few instances of weird var_edited mapping markers that I also got rid of in this PR as well. I also split off markers out of lighting.dmi into their own .dmi.
Why It's Good For The Game

image

Gives mappers the power to use these sprites that we already have in the codebase in their conquest to make stuff look better.
Changelog

cl
add: On the mapping end, mappers are now able to add a wide range of funky new colors to maps. Keep an eye out, for they might just be coming to a station near you sometime soon.
/cl
This commit is contained in:
san7890
2022-05-08 15:16:23 -06:00
committed by GitHub
parent 8aa865c95a
commit 7517e7904f
5 changed files with 50 additions and 14 deletions

View File

@@ -728,9 +728,7 @@
/area/ruin/space/has_grav/hellfactory)
"ct" = (
/obj/machinery/light/built/directional/south,
/obj/structure/marker_beacon{
icon_state = "markerburgundy-on"
},
/obj/structure/marker_beacon/burgundy,
/turf/open/floor/iron,
/area/ruin/space/has_grav/hellfactory)
"cu" = (
@@ -885,9 +883,7 @@
/area/ruin/space/has_grav/hellfactory)
"cR" = (
/obj/structure/lattice/catwalk,
/obj/structure/marker_beacon{
icon_state = "markerburgundy-on"
},
/obj/structure/marker_beacon/burgundy,
/turf/template_noop,
/area/ruin/space/has_grav/hellfactory)
"cS" = (
@@ -897,9 +893,7 @@
/area/ruin/space/has_grav/hellfactory)
"cT" = (
/obj/machinery/light/broken/directional/south,
/obj/structure/marker_beacon{
icon_state = "markerburgundy-on"
},
/obj/structure/marker_beacon/burgundy,
/obj/structure/cable,
/turf/open/floor/iron,
/area/ruin/space/has_grav/hellfactory)

View File

@@ -22985,9 +22985,7 @@
},
/area/station/maintenance/department/medical/central)
"hpx" = (
/obj/structure/marker_beacon{
icon_state = "markerburgundy-on"
},
/obj/structure/marker_beacon/burgundy,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/underground/explored)
"hpB" = (

View File

@@ -18,7 +18,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, sort_list(list(
name = "marker beacon"
singular_name = "marker beacon"
desc = "Prism-brand path illumination devices. Used by miners to mark paths and warn of danger."
icon = 'icons/obj/lighting.dmi'
icon = 'icons/obj/marker.dmi'
icon_state = "marker"
merge_type = /obj/item/stack/marker_beacon
max_amount = 100
@@ -162,8 +162,52 @@ GLOBAL_LIST_INIT(marker_beacon_colors, sort_list(list(
/* Preset marker beacon types, for mapping */
// Set the icon_state here to make it clear for mappers.
/obj/structure/marker_beacon/burgundy
picked_color = "Burgundy"
// set icon_state to make it clear for mappers
icon_state = "markerburgundy-on"
/obj/structure/marker_beacon/bronze
picked_color = "Bronze"
icon_state = "markerbronze-on"
/obj/structure/marker_beacon/yellow
picked_color = "Yellow"
icon_state = "markeryellow-on"
/obj/structure/marker_beacon/lime
picked_color = "Lime"
icon_state = "markerlime-on"
/obj/structure/marker_beacon/olive
picked_color = "Olive"
icon_state = "markerolive-on"
/obj/structure/marker_beacon/jade
picked_color = "Jade"
icon_state = "markerjade-on"
/obj/structure/marker_beacon/teal
picked_color = "Teal"
icon_state = "markerteal-on"
/obj/structure/marker_beacon/cerulean
picked_color = "Cerulean"
icon_state = "markercerulean-on"
/obj/structure/marker_beacon/indigo
picked_color = "Indigo"
icon_state = "markerindigo-on"
/obj/structure/marker_beacon/purple
picked_color = "Purple"
icon_state = "markerpurple-on"
/obj/structure/marker_beacon/violet
picked_color = "Violet"
icon_state = "markerviolet-on"
/obj/structure/marker_beacon/fuchsia
picked_color = "Fuchsia"
icon_state = "markerfuchsia-on"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 76 KiB

After

Width:  |  Height:  |  Size: 73 KiB

BIN
icons/obj/marker.dmi Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB