Merge conflict fix

2020-05-13 12:37:18 +03:00
parent ccae3aebd5 78004a7b73
commit 5b7d9a9008
985 changed files with 295527 additions and 16121 deletions
@@ -10,3 +10,14 @@
 	icon_state = "holograph_on"

 	density = TRUE
+
+/obj/machinery/shuttle_manipulator/update_overlays()
+	. = ..()
+	var/mutable_appearance/hologram_projection = mutable_appearance(icon, "hologram_on")
+	hologram_projection.pixel_y = 22
+	var/mutable_appearance/hologram_ship = mutable_appearance(icon, "hologram_whiteship")
+	hologram_ship.pixel_y = 27
+	add_overlay(hologram_projection)
+	add_overlay(hologram_ship)
+	. += hologram_projection
+	. += hologram_ship