Resolves conflicts.

2026-08-23 12:07:27 +01:00 · 2018-10-11 05:36:22 -05:00
parent 4c062212ab 44ba995aa6
commit f7627d2fcb
486 changed files with 16260 additions and 10647 deletions
@@ -476,7 +476,7 @@
 	pixel_x = -64
 	pixel_y = -64
 	unacidable = 1
-	mouse_opacity = 0
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	var/mob/living/immune = list() // the one who creates the timestop is immune
 	var/list/stopped_atoms = list()
 	var/freezerange = 2