Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26813

This commit is contained in:
kevinz000
2017-05-07 22:28:00 -07:00
176 changed files with 1933 additions and 648 deletions
+1
View File
@@ -4,6 +4,7 @@
desc = "There are three parts to the ear. Inner, middle and outer. Only one of these parts should be normally visible."
zone = "head"
slot = "ears"
gender = PLURAL
// `deaf` measures "ticks" of deafness. While > 0, the person is unable
// to hear anything.
+1
View File
@@ -4,6 +4,7 @@
desc = "I see you!"
zone = "eyes"
slot = "eye_sight"
gender = PLURAL
var/sight_flags = 0
var/see_in_dark = 2
@@ -8,6 +8,7 @@
icon_state = "appendix"
zone = "mouth"
slot = "vocal_cords"
gender = PLURAL
var/list/spans = null
/obj/item/organ/vocal_cords/proc/can_speak_with() //if there is any limitation to speaking with these cords