From 11b4a00322c07125e7cf75c44b89c368aa98da0e Mon Sep 17 00:00:00 2001 From: LetterJay Date: Thu, 18 May 2017 22:43:55 -0500 Subject: [PATCH] self merge --- code/game/machinery/hologram.dm | 2 +- code/game/machinery/hologram.dm.rej | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 code/game/machinery/hologram.dm.rej diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 2c2e39c4d7..7ad6c3a1f7 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -295,7 +295,7 @@ GLOBAL_LIST_EMPTY(holopads) Hologram.Impersonation = user - Hologram.language_holder = user.get_language_holder() + Hologram.copy_known_languages_from(user,replace = TRUE) Hologram.mouse_opacity = 0//So you can't click on it. Hologram.layer = FLY_LAYER//Above all the other objects/mobs. Or the vast majority of them. diff --git a/code/game/machinery/hologram.dm.rej b/code/game/machinery/hologram.dm.rej deleted file mode 100644 index fbb5cbc866..0000000000 --- a/code/game/machinery/hologram.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm (rejected hunks) -@@ -295,7 +295,7 @@ GLOBAL_LIST_EMPTY(holopads) - Hologram.add_atom_colour("#77abff", FIXED_COLOUR_PRIORITY) - Hologram.Impersonation = user - -- Hologram.language_holder = user.get_language_holder() -+ Hologram.copy_known_languages_from(user,replace = TRUE) - Hologram.mouse_opacity = 0//So you can't click on it. - Hologram.layer = FLY_LAYER//Above all the other objects/mobs. Or the vast majority of them. - Hologram.anchored = 1//So space wind cannot drag it.