From 05df413ed79b742a5e74a3a0eee5073ea4c0b6f2 Mon Sep 17 00:00:00 2001
From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com>
Date: Fri, 27 Sep 2019 12:37:40 -0700
Subject: [PATCH] overlay

---
 code/controllers/subsystem/vis_overlays.dm | 47 +++++++++++++++-------
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/code/controllers/subsystem/vis_overlays.dm b/code/controllers/subsystem/vis_overlays.dm
index 435414a8..07c786b1 100644
--- a/code/controllers/subsystem/vis_overlays.dm
+++ b/code/controllers/subsystem/vis_overlays.dm
@@ -5,11 +5,13 @@ SUBSYSTEM_DEF(vis_overlays)
 	init_order = INIT_ORDER_VIS
 
 	var/list/vis_overlay_cache
+	var/list/unique_vis_overlays
 	var/list/currentrun
 	var/datum/callback/rotate_cb
 
 /datum/controller/subsystem/vis_overlays/Initialize()
 	vis_overlay_cache = list()
+	unique_vis_overlays = list()
 	rotate_cb = CALLBACK(src, .proc/rotate_vis_overlay)
 	return ..()
 
@@ -31,20 +33,23 @@ SUBSYSTEM_DEF(vis_overlays)
 			return
 
 //the "thing" var can be anything with vis_contents which includes images
-/datum/controller/subsystem/vis_overlays/proc/add_vis_overlay(atom/movable/thing, icon, iconstate, layer, plane, dir, alpha=255)
-	. = "[icon]|[iconstate]|[layer]|[plane]|[dir]|[alpha]"
-	var/obj/effect/overlay/vis/overlay = vis_overlay_cache[.]
-	if(!overlay)
-		overlay = new
-		overlay.icon = icon
-		overlay.icon_state = iconstate
-		overlay.layer = layer
-		overlay.plane = plane
-		overlay.dir = dir
-		overlay.alpha = alpha
-		vis_overlay_cache[.] = overlay
+/datum/controller/subsystem/vis_overlays/proc/add_vis_overlay(atom/movable/thing, icon, iconstate, layer, plane, dir, alpha = 255, add_appearance_flags = NONE, unique = FALSE)
+	var/obj/effect/overlay/vis/overlay
+	if(!unique)
+		. = "[icon]|[iconstate]|[layer]|[plane]|[dir]|[alpha]|[add_appearance_flags]"
+		overlay = vis_overlay_cache[.]
+		if(!overlay)
+			overlay = _create_new_vis_overlay(icon, iconstate, layer, plane, dir, alpha, add_appearance_flags)
+			vis_overlay_cache[.] = overlay
+		else
+			overlay.unused = 0
 	else
-		overlay.unused = 0
+		overlay = _create_new_vis_overlay(icon, iconstate, layer, plane, dir, alpha, add_appearance_flags)
+		overlay.cache_expiration = -1
+		var/cache_id = "\ref[overlay]@{[world.time]}"
+		unique_vis_overlays += overlay
+		vis_overlay_cache[cache_id] = overlay
+		. = overlay
 	thing.vis_contents += overlay
 
 	if(!isatom(thing)) // Automatic rotation is not supported on non atoms
@@ -56,6 +61,17 @@ SUBSYSTEM_DEF(vis_overlays)
 	else
 		thing.managed_vis_overlays += overlay
 
+/datum/controller/subsystem/vis_overlays/proc/_create_new_vis_overlay(icon, iconstate, layer, plane, dir, alpha, add_appearance_flags)
+	var/obj/effect/overlay/vis/overlay = new
+	overlay.icon = icon
+	overlay.icon_state = iconstate
+	overlay.layer = layer
+	overlay.plane = plane
+	overlay.dir = dir
+	overlay.alpha = alpha
+	overlay.appearance_flags |= add_appearance_flags
+	return overlay
+
 /datum/controller/subsystem/vis_overlays/proc/remove_vis_overlay(atom/movable/thing, list/overlays)
 	thing.vis_contents -= overlays
 	if(!isatom(thing))
@@ -68,8 +84,11 @@ SUBSYSTEM_DEF(vis_overlays)
 /datum/controller/subsystem/vis_overlays/proc/rotate_vis_overlay(atom/thing, old_dir, new_dir)
 	var/rotation = dir2angle(old_dir) - dir2angle(new_dir)
 	var/list/overlays_to_remove = list()
-	for(var/i in thing.managed_vis_overlays)
+	for(var/i in thing.managed_vis_overlays - unique_vis_overlays)
 		var/obj/effect/overlay/vis/overlay = i
 		add_vis_overlay(thing, overlay.icon, overlay.icon_state, overlay.layer, overlay.plane, turn(overlay.dir, rotation))
 		overlays_to_remove += overlay
+	for(var/i in thing.managed_vis_overlays & unique_vis_overlays)
+		var/obj/effect/overlay/vis/overlay = i
+		overlay.dir = turn(overlay.dir, rotation)
 	remove_vis_overlay(thing, overlays_to_remove)