Merge pull request #265 from Artorp/DisabilityFixes

Disability fixes
This commit is contained in:
Fox-McCloud
2015-02-09 00:23:01 -05:00
5 changed files with 5 additions and 6 deletions
+1 -1
View File
@@ -67,7 +67,7 @@
disability=EPILEPSY
New()
block=HEADACHEBLOCK
block=EPILEPSYBLOCK
/datum/dna/gene/disability/cough
name="Coughing"
-1
View File
@@ -49,7 +49,6 @@
NERVOUSBLOCK = getAssignedBlock("NERVOUS", numsToAssign)
// Bay muts
HEADACHEBLOCK = getAssignedBlock("HEADACHE", numsToAssign)
NOBREATHBLOCK = getAssignedBlock("NOBREATH", numsToAssign, DNA_HARD_BOUNDS, good=1)
REMOTEVIEWBLOCK = getAssignedBlock("REMOTEVIEW", numsToAssign, DNA_HARDER_BOUNDS, good=1)
REGENERATEBLOCK = getAssignedBlock("REGENERATE", numsToAssign, DNA_HARDER_BOUNDS, good=1)
@@ -476,7 +476,7 @@
value = 0xFFF
//block = 3
New()
block = HEADACHEBLOCK
block = EPILEPSYBLOCK
..()
/obj/item/weapon/dnainjector/antiepi
@@ -486,7 +486,7 @@
value = 0x001
//block = 3
New()
block = HEADACHEBLOCK
block = EPILEPSYBLOCK
..()
/obj/item/weapon/dnainjector/anticough
-1
View File
@@ -55,7 +55,6 @@ var/MONKEYBLOCK = 50 // Monkey block will always be the DNA_SE_LENGTH
var/BLOCKADD = 0
var/DIFFMUT = 0
var/HEADACHEBLOCK = 0
var/NOBREATHBLOCK = 0
var/REMOTEVIEWBLOCK = 0
var/REGENERATEBLOCK = 0
+2 -1
View File
@@ -529,7 +529,8 @@
if(client.prefs.disabilities & DISABILITY_FLAG_DEAF)
new_character.dna.SetSEState(DEAFBLOCK,1,1)
new_character.sdisabilities |= DEAF
domutcheck(new_character)
new_character.dna.UpdateSE()