From 2811f744e33dc7c2005b14090c0c7a7820a8ab26 Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Wed, 26 Aug 2020 14:00:35 +0200
Subject: [PATCH] Fixing some mistakes with the priority overlays removal PR.

---
 code/datums/elements/decal.dm             | 10 +++++-----
 code/game/objects/effects/decals/decal.dm |  2 +-
 code/modules/projectiles/guns/energy.dm   |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/code/datums/elements/decal.dm b/code/datums/elements/decal.dm
index 50519b08e7..5ddd5bd03e 100644
--- a/code/datums/elements/decal.dm
+++ b/code/datums/elements/decal.dm
@@ -32,6 +32,7 @@
 			RegisterSignal(A, COMSIG_COMPONENT_CLEAN_ACT, .proc/clean_react)
 		if(description)
 			RegisterSignal(A, COMSIG_PARENT_EXAMINE, .proc/examine)
+		RegisterSignal(A, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/apply_overlay, TRUE)
 
 	num_decals_per_atom[A]++
 	apply(A)
@@ -39,21 +40,20 @@
 /datum/element/decal/Detach(datum/target)
 	var/atom/A = target
 	num_decals_per_atom[A]--
-	apply(A, TRUE)
 	if(!num_decals_per_atom[A])
 		UnregisterSignal(A, list(COMSIG_ATOM_DIR_CHANGE, COMSIG_COMPONENT_CLEAN_ACT, COMSIG_PARENT_EXAMINE, COMSIG_ATOM_UPDATE_OVERLAYS))
 		LAZYREMOVE(num_decals_per_atom, A)
+	apply(A)
 	return ..()
 
-/datum/element/decal/proc/apply(atom/target, removing = FALSE)
-	if(num_decals_per_atom[target] == 1 && !removing)
-		RegisterSignal(target, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/apply_overlay, TRUE)
+/datum/element/decal/proc/apply(atom/target)
 	target.update_icon()
 	if(isitem(target))
 		addtimer(CALLBACK(target, /obj/item/.proc/update_slot_icon), 0, TIMER_UNIQUE)
 
 /datum/element/decal/proc/apply_overlay(atom/source, list/overlay_list)
-	pic.dir = first_dir == NORTH ? source.dir : turn(first_dir, dir2angle(source.dir))
+	if(first_dir)
+		pic.dir = turn(first_dir, -dir2angle(source.dir))
 	for(var/i in 1 to num_decals_per_atom[source])
 		overlay_list += pic
 
diff --git a/code/game/objects/effects/decals/decal.dm b/code/game/objects/effects/decals/decal.dm
index 25b262a146..b280851888 100644
--- a/code/game/objects/effects/decals/decal.dm
+++ b/code/game/objects/effects/decals/decal.dm
@@ -46,4 +46,4 @@
 	var/turf/T = loc
 	if(!istype(T)) //you know this will happen somehow
 		CRASH("Turf decal initialized in an object/nullspace")
-	T.AddElement(/datum/element/decal, icon, icon_state, turn(dir, -dir2angle(T.dir)), CLEAN_GOD, color, null, null, alpha)
+	T.AddElement(/datum/element/decal, icon, icon_state, dir, CLEAN_GOD, color, null, null, alpha)
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index 17dcfa96e6..0a587e8eba 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -268,7 +268,7 @@
 			for(var/i = ratio, i >= 1, i--)
 				charge_overlay.pixel_x = ammo_x_offset * (i - 1)
 				charge_overlay.pixel_y = ammo_y_offset * (i - 1)
-				. += charge_overlay
+				. += new /mutable_appearance(charge_overlay)
 		else
 			. += "[icon_state]_charge[ratio]"