July 5th TG sync (#1883)

July 5th TG sync
This commit is contained in:
Poojawa
2017-07-05 22:14:19 -05:00
committed by GitHub
parent 454b9c3d68
commit b1b4826c0c
1264 changed files with 149689 additions and 570309 deletions
+5 -2
View File
@@ -17,6 +17,9 @@
/datum/language_holder/Destroy()
owner = null
QDEL_NULL(language_menu)
languages.Cut()
shadow_languages.Cut()
return ..()
/datum/language_holder/proc/copy(newowner)
var/datum/language_holder/copy = new(newowner)
@@ -65,7 +68,7 @@
var/datum/language_holder/other
if(istype(thing, /datum/language_holder))
other = thing
else if(istype(thing, /atom/movable))
else if(ismovableatom(thing))
var/atom/movable/AM = thing
other = AM.get_language_holder()
else if(istype(thing, /datum/mind))
@@ -85,7 +88,7 @@
language_menu.ui_interact(user)
/datum/language_holder/proc/get_atom()
if(istype(owner, /atom/movable))
if(ismovableatom(owner))
. = owner
else if(istype(owner, /datum/mind))
var/datum/mind/M = owner