Merge pull request #13224 from Ghommie/Ghommie-cit835

Removing priority overlays, update_icon() splitup for guns.
2020-08-22 15:19:07 -07:00
parent 1a4339065b cd10655985
commit 7737e76b32
36 changed files with 298 additions and 305 deletions
@@ -317,6 +317,13 @@
 	icon_state = unique_reskin[choice]
 	to_chat(M, "[src] is now skinned as '[choice]'.")

+/obj/update_overlays()
+	. = ..()
+	if(acid_level)
+		. += GLOB.acid_overlay
+	if(resistance_flags & ON_FIRE)
+		. += GLOB.fire_overlay
+
 //Called when the object is constructed by an autolathe
 //Has a reference to the autolathe so you can do !!FUN!! things with hacked lathes
 /obj/proc/autolathe_crafted(obj/machinery/autolathe/A)