Merge branch 'prettyovermap' into overmap4

code/modules/overmap/objects/dynamic_datum.dm

@@ -128,7 +128,7 @@
 			Rename("lava planet")
 			token.desc = "A very weak energy signal originating from a planet with lots of seismic and volcanic activity."
 			planet = DYNAMIC_WORLD_LAVA
-			token.icon_state = "globe"
+			token.icon_state = "globe_2"
 			token.color = COLOR_ORANGE
 			planet_name = gen_planet_name()
 
@@ -142,7 +142,7 @@
 			Rename("frozen planet")
 			token.desc = "A very weak energy signal originating from a planet with traces of water and extremely low temperatures."
 			planet = DYNAMIC_WORLD_ICE
-			token.icon_state = "globe"
+			token.icon_state = "globe_2"
 			token.color = COLOR_BLUE_LIGHT
 			planet_name = gen_planet_name()
 
@@ -170,7 +170,7 @@
 			Rename("sand planet")
 			token.desc = "A very weak energy signal originating from a planet with many traces of silica."
 			planet = DYNAMIC_WORLD_SAND
-			token.icon_state = "globe"
+			token.icon_state = "globe_2"
 			token.color = COLOR_GRAY
 			planet_name = gen_planet_name()
 
@@ -184,7 +184,7 @@
 			Rename("waste disposal planet")
 			token.desc = "A very weak energy signal originating from a planet marked as waste disposal."
 			planet = DYNAMIC_WORLD_WASTEPLANET
-			token.icon_state = "globe"
+			token.icon_state = "globe_2"
 			token.color = "#a9883e"
 			planet_name = gen_planet_name()
 
@@ -198,7 +198,7 @@
 			Rename("rock planet")
 			token.desc = "A very weak energy signal originating from a iron rich and rocky planet."
 			planet = DYNAMIC_WORLD_ROCKPLANET
-			token.icon_state = "globe"
+			token.icon_state = "globe_2"
 			token.color = "#bd1313"
 			planet_name = gen_planet_name()
 
@@ -262,6 +262,7 @@
 
 	if(!preserve_level)
 		token.desc += "It may not still be here if you leave it."
+	token.update_icon()
 
 /datum/overmap/dynamic/proc/gen_planet_name()
 	. = ""

code/modules/overmap/objects/event_datum.dm

@@ -48,6 +48,9 @@
 /datum/overmap/event/meteor/Initialize(position, ...)
 	. = ..()
 	token.icon_state = "meteor[rand(1, 4)]"
+	token.color = "#a08444"
+	token.light_color = "#a08444"
+	token.update_icon()
 
 /datum/overmap/event/meteor/affect_ship(datum/overmap/ship/controlled/S)
 	var/area/source_area = pick(S.shuttle_port.shuttle_areas)
@@ -84,6 +87,9 @@
 /datum/overmap/event/emp/Initialize(position, ...)
 	. = ..()
 	token.icon_state = "ion[rand(1, 4)]"
+	token.color = "#7cb4d4"
+	token.light_color = "#7cb4d4"
+	token.update_icon()
 
 /datum/overmap/event/emp/affect_ship(datum/overmap/ship/controlled/S)
 	var/area/source_area = pick(S.shuttle_port.shuttle_areas)
@@ -119,6 +125,9 @@
 /datum/overmap/event/electric/Initialize(position, ...)
 	. = ..()
 	token.icon_state = "electrical[rand(1, 4)]"
+	token.color = "#e8e85c"
+	token.light_color = "#e8e85c"
+	token.update_icon()
 
 /datum/overmap/event/electric/affect_ship(datum/overmap/ship/controlled/S)
 	var/area/source_area = pick(S.shuttle_port.shuttle_areas)
@@ -154,6 +163,9 @@
 /datum/overmap/event/nebula/Initialize(position, ...)
 	. = ..()
 	token.opacity = TRUE
+	token.color = "#c053f3"
+	token.light_color = "#c053f3"
+	token.update_icon()
 
 /datum/overmap/event/wormhole
 	name = "wormhole"
@@ -173,6 +185,9 @@
 		other_wormhole = _other_wormhole
 	if(!other_wormhole)
 		other_wormhole = new(null, src) //Create a new wormhole at a random location
+	token.color = adjust_colors()
+	token.light_color = adjust_colors()
+	token.update_icon()
 
 /datum/overmap/event/wormhole/affect_ship(datum/overmap/ship/controlled/S)
 	if(!other_wormhole)
@@ -193,6 +208,22 @@
 	S.overmap_move(other_wormhole.x, other_wormhole.y)
 	S.overmap_step(S.get_heading())
 
+	token.color = adjust_colors()
+	token.light_color = adjust_colors()
+
+/datum/overmap/event/wormhole/proc/adjust_colors()
+	switch(stability)
+		if(1)
+			return "#403214"
+		if(2)
+			return "#513a19"
+		if(3)
+			return"#654650"
+		if(4)
+			return"#6a5d8b"
+		if(5)
+			return"#8081c7"
+
 GLOBAL_LIST_INIT(overmap_event_pick_list, list(
 	/datum/overmap/event/wormhole = 10,
 	/datum/overmap/event/nebula = 60,

code/modules/overmap/overmap_token.dm

@@ -34,6 +34,7 @@
 		cam_background.assigned_map = map_name
 		cam_background.del_on_map_removal = FALSE
 		update_screen()
+	update_icon()
 
 /obj/overmap/Destroy(force)
 	if(parent)
@@ -99,3 +100,9 @@
 		cam_background.icon_state = "clear"
 		cam_background.fill_rect(1, 1, size_x, size_y)
 		return TRUE
+/obj/overmap/update_icon()
+	. = ..()
+	if(color)
+		filters = filter(type="drop_shadow", color = color + "F0", size = 2, offset = 1,x = 0, y = 0)
+	else
+		filters = filter(type="drop_shadow", size = 2, offset = 1,x = 0, y = 0)