Merge remote-tracking branch 'polaris/master' into polaris-sync

# Conflicts:
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/zresearchlabs.dmm
This commit is contained in:
Leshana
2017-04-15 23:14:32 -05:00
108 changed files with 3048 additions and 809 deletions
+1
View File
@@ -203,6 +203,7 @@ var/list/organ_cache = list()
/obj/item/organ/proc/rejuvenate(var/ignore_prosthetic_prefs)
damage = 0
status = 0
germ_level = 0
if(!ignore_prosthetic_prefs && owner && owner.client && owner.client.prefs && owner.client.prefs.real_name == owner.real_name)
var/status = owner.client.prefs.organ_data[organ_tag]
if(status == "assisted")