fix roundstart/rej cleanup

This commit is contained in:
LetterJay
2017-05-17 05:08:51 -05:00
parent 932f323e39
commit 1948b007d1
11 changed files with 14 additions and 147 deletions
-10
View File
@@ -1,10 +0,0 @@
diff a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm (rejected hunks)
@@ -571,7 +571,7 @@
/* Language procs */
-/atom/movable/proc/get_language_holder()
+/atom/movable/proc/get_language_holder(shadow=TRUE)
if(language_holder)
return language_holder
else
-17
View File
@@ -1,17 +0,0 @@
diff a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm (rejected hunks)
@@ -294,7 +294,7 @@ GLOBAL_LIST_EMPTY(holopads)
Hologram.add_atom_colour("#77abff", FIXED_COLOUR_PRIORITY)
Hologram.Impersonation = user
- Hologram.languages = user.languages
+ Hologram.language_holder = user.get_language_holder()
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.
@@ -392,4 +392,4 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
req_components = list(/obj/item/weapon/stock_parts/capacitor = 1)
#undef HOLOPAD_PASSIVE_POWER_USAGE
-#undef HOLOGRAM_POWER_USAGE
\ No newline at end of file
+#undef HOLOGRAM_POWER_USAGE