shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

self merge

Browse Source
This commit is contained in:
LetterJay
2017-05-18 22:43:55 -05:00
parent 79655b17e5
commit 11b4a00322
2 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/hologram.dm
+1 -1
View File
@@ -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.
code/game/machinery/hologram.dm.rej
-10
View File
@@ -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.