cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-11 23:23:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

removes stupid sdisabilities

Browse Source
This commit is contained in:
Fox-McCloud
2016-07-21 02:24:54 -04:00
parent 1ac09a962c
commit 00a470fd6d
31 changed files with 80 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference/preferences.dm
+3 -3
View File
@@ -1920,15 +1920,15 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
if(disabilities & DISABILITY_FLAG_DEAF)
character.dna.SetSEState(DEAFBLOCK,1,1)
character.sdisabilities|=DEAF
character.disabilities|=DEAF
if(disabilities & DISABILITY_FLAG_BLIND)
character.dna.SetSEState(BLINDBLOCK,1,1)
character.sdisabilities|=BLIND
character.disabilities|=BLIND
if(disabilities & DISABILITY_FLAG_MUTE)
character.dna.SetSEState(MUTEBLOCK,1,1)
character.sdisabilities |= MUTE
character.disabilities |= MUTE
S.handle_dna(character)
code/modules/mob/hear_say.dm
+4 -4
View File
@@ -28,7 +28,7 @@
//non-verbal languages are garbled if you can't see the speaker. Yes, this includes if they are inside a closet.
if(language && (language.flags & NONVERBAL))
if(sdisabilities & BLIND || blinded) //blind people can't see dumbass
if(disabilities & BLIND || blinded) //blind people can't see dumbass
message = stars(message)
if(!speaker || !(speaker in view(src)))
@@ -65,7 +65,7 @@
if(client.prefs.toggles & CHAT_GHOSTEARS && speaker in view(src))
message = "<b>[message]</b>"
if(sdisabilities & DEAF || ear_deaf)
if(disabilities & DEAF || ear_deaf)
if(!language || !(language.flags & INNATE)) // INNATE is the flag for audible-emote-language, so we don't want to show an "x talks but you cannot hear them" message if it's set
if(speaker == src)
to_chat(src, "<span class='warning'>You cannot hear yourself speak!</span>")
@@ -95,7 +95,7 @@
//non-verbal languages are garbled if you can't see the speaker. Yes, this includes if they are inside a closet.
if(language && (language.flags & NONVERBAL))
if(sdisabilities & BLIND || blinded) //blind people can't see dumbass
if(disabilities & BLIND || blinded) //blind people can't see dumbass
message = stars(message)
if(!speaker || !(speaker in view(src)))
@@ -182,7 +182,7 @@
formatted = language.format_message_radio(message, verb)
else
formatted = "[verb], <span class=\"body\">\"[message]\"</span>"
if(sdisabilities & DEAF || ear_deaf)
if(disabilities & DEAF || ear_deaf)
if(prob(20))
to_chat(src, "<span class='warning'>You feel your headset vibrate but can hear nothing from it!</span>")
else if(track)
code/modules/mob/living/carbon/alien/humanoid/life.dm
+2 -2
View File
@@ -95,7 +95,7 @@
move_delay_add = max(0, move_delay_add - rand(1, 2))
//Eyes
if(sdisabilities & BLIND) //disabled-blind, doesn't get better on its own
if(disabilities & BLIND) //disabled-blind, doesn't get better on its own
blinded = 1
else if(eye_blind) //blindness, heals slowly over time
eye_blind = max(eye_blind-1,0)
@@ -104,7 +104,7 @@
eye_blurry = max(eye_blurry-1, 0)
//Ears
if(sdisabilities & DEAF) //disabled-deaf, doesn't get better on its own
if(disabilities & DEAF) //disabled-deaf, doesn't get better on its own
ear_deaf = max(ear_deaf, 1)
else if(ear_deaf) //deafness, heals slowly over time
ear_deaf = max(ear_deaf-1, 0)
code/modules/mob/living/carbon/alien/larva/life.dm
+2 -2
View File
@@ -54,7 +54,7 @@
move_delay_add = max(0, move_delay_add - rand(1, 2))
//Eyes
if(sdisabilities & BLIND) //disabled-blind, doesn't get better on its own
if(disabilities & BLIND) //disabled-blind, doesn't get better on its own
blinded = 1
else if(eye_blind) //blindness, heals slowly over time
eye_blind = max(eye_blind-1,0)
@@ -63,7 +63,7 @@
eye_blurry = max(eye_blurry-1, 0)
//Ears
if(sdisabilities & DEAF) //disabled-deaf, doesn't get better on its own
if(disabilities & DEAF) //disabled-deaf, doesn't get better on its own
ear_deaf = max(ear_deaf, 1)
else if(ear_deaf) //deafness, heals slowly over time
ear_deaf = max(ear_deaf-1, 0)
code/modules/mob/living/carbon/human/emote.dm
+1 -1
View File
@@ -10,7 +10,7 @@
act = copytext(act, 1, t1)
var/muzzled = is_muzzled()
if(sdisabilities & MUTE || silent)
if(disabilities & MUTE || silent)
muzzled = 1
//var/m_type = 1
code/modules/mob/living/carbon/human/life.dm
+2 -2
View File
@@ -861,7 +861,7 @@
else
//blindness
if(sdisabilities & BLIND) // Disabled-blind, doesn't get better on its own
if(disabilities & BLIND) // Disabled-blind, doesn't get better on its own
blinded = 1
else if(eye_blind) // Blindness, heals slowly over time
@@ -881,7 +881,7 @@
//Ears
if(sdisabilities & DEAF) //disabled-deaf, doesn't get better on its own
if(disabilities & DEAF) //disabled-deaf, doesn't get better on its own
ear_deaf = max(ear_deaf, 1)
else if(ear_deaf) //deafness, heals slowly over time
code/modules/mob/living/carbon/human/say.dm
+1 -1
View File
@@ -106,7 +106,7 @@
var/list/returns[3]
var/speech_problem_flag = 0
if(silent || (sdisabilities & MUTE))
if(silent || (disabilities & MUTE))
message = ""
speech_problem_flag = 1
code/modules/mob/living/carbon/slime/life.dm
+2 -2
View File
@@ -217,9 +217,9 @@
src.density = !( src.lying )
if(src.sdisabilities & BLIND)
if(src.disabilities & BLIND)
src.blinded = 1
if(src.sdisabilities & DEAF)
if(src.disabilities & DEAF)
src.ear_deaf = 1
if(src.eye_blurry > 0)
code/modules/mob/living/life.dm
+1 -1
View File
@@ -174,7 +174,7 @@
/mob/living/proc/handle_disabilities()
//Eyes
if(sdisabilities & BLIND || stat) //blindness from disability or unconsciousness doesn't get better on its own
if(disabilities & BLIND || stat) //blindness from disability or unconsciousness doesn't get better on its own
eye_blind = max(eye_blind, 1)
else if(eye_blind) //blindness, heals slowly over time
eye_blind = max(eye_blind-1,0)
code/modules/mob/living/living.dm
+1 -2
View File
@@ -373,7 +373,6 @@
hallucination = 0
nutrition = 400
bodytemperature = 310
sdisabilities = 0
disabilities = 0
blinded = 0
eye_blind = 0
@@ -646,7 +645,7 @@
//called when the mob receives a bright flash
/mob/living/proc/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /obj/screen/fullscreen/flash)
if(check_eye_prot() < intensity && (override_blindness_check || !(sdisabilities & BLIND)))
if(check_eye_prot() < intensity && (override_blindness_check || !(disabilities & BLIND)))
overlay_fullscreen("flash", type)
addtimer(src, "clear_fullscreen", 25, FALSE, "flash", 25)
return 1
code/modules/mob/mob.dm
+3 -3
View File
@@ -62,19 +62,19 @@
if(!client) return
if(type)
if(type & 1 && (sdisabilities & BLIND || blinded || paralysis) )//Vision related
if(type & 1 && (disabilities & BLIND || blinded || paralysis) )//Vision related
if(!( alt ))
return
else
msg = alt
type = alt_type
if(type & 2 && (sdisabilities & DEAF || ear_deaf))//Hearing related
if(type & 2 && (disabilities & DEAF || ear_deaf))//Hearing related
if(!( alt ))
return
else
msg = alt
type = alt_type
if((type & 1 && sdisabilities & BLIND))
if((type & 1 && disabilities & BLIND))
return
// Added voice muffling for Issue 41.
if(stat == UNCONSCIOUS || (sleeping > 0 && stat != 2))
code/modules/mob/mob_defines.dm
-1
View File
@@ -33,7 +33,6 @@
var/obj/machinery/machine = null
var/other_mobs = null
var/memory = ""
var/sdisabilities = 0 //Carbon
var/disabilities = 0 //Carbon
var/atom/movable/pulling = null
var/next_move = null
code/modules/mob/mob_helpers.dm
+2 -2
View File
@@ -63,7 +63,7 @@ proc/iscuffed(A)
proc/isdeaf(A)
if(istype(A, /mob))
var/mob/M = A
return (M.sdisabilities & DEAF) || M.ear_deaf
return (M.disabilities & DEAF) || M.ear_deaf
return 0
proc/hassensorlevel(A, var/level)
@@ -358,7 +358,7 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HARM)
/proc/is_blind(A)
if(iscarbon(A))
var/mob/living/carbon/C = A
if(C.sdisabilities & BLIND || C.blinded)
if(C.disabilities & BLIND || C.blinded)
return 1
return 0
code/modules/mob/typing_indicator.dm
+2 -2
View File
@@ -15,10 +15,10 @@ var/global/image/typing_indicator
if(ishuman(src))
var/mob/living/carbon/human/H = src
if(H.sdisabilities & MUTE || H.silent)
if(H.disabilities & MUTE || H.silent)
overlays -= typing_indicator
return
if(client)
if((client.prefs.toggles & SHOW_TYPING) || stat != CONSCIOUS || is_muzzled())
overlays -= typing_indicator
code/modules/reagents/newchem/medicine.dm
+2 -2
View File
@@ -482,7 +482,7 @@
if(prob(50))
M.disabilities &= ~NEARSIGHTED
if(prob(30))
M.sdisabilities &= ~BLIND
M.disabilities &= ~BLIND
M.eye_blind = 0
if(M.ear_damage <= 25)
if(prob(30))
@@ -696,7 +696,7 @@
/datum/reagent/mutadone/on_mob_life(mob/living/carbon/human/M)
M.jitteriness = 0
var/needs_update = M.mutations.len > 0 || M.disabilities > 0 || M.sdisabilities > 0
var/needs_update = M.mutations.len > 0 || M.disabilities > 0
if(needs_update)
for(var/block=1;block<=DNA_SE_LENGTH;block++)
code/modules/reagents/oldchem/reagents/reagents_admin.dm
-1
View File
@@ -25,7 +25,6 @@
if(E.mend_fracture())
E.perma_injury = 0
M.disabilities = 0
M.sdisabilities = 0
M.eye_blurry = 0
M.eye_blind = 0
M.SetWeakened(0)
code/modules/surgery/organs/organ_internal.dm
+1 -1
View File
@@ -357,7 +357,7 @@
if(!owner)
return
owner.disabilities &= ~NEARSIGHTED
owner.sdisabilities &= ~BLIND
owner.disabilities &= ~BLIND
owner.eye_blurry = 0
owner.eye_blind = 0
code/modules/surgery/organs/subtypes/diona.dm
+1 -1
View File
@@ -170,7 +170,7 @@
if(!owner)
return
owner.disabilities &= ~NEARSIGHTED
owner.sdisabilities &= ~BLIND
owner.disabilities &= ~BLIND
owner.eye_blurry = 0
owner.eye_blind = 0
code/modules/surgery/organs/subtypes/machine.dm
+1 -1
View File
@@ -150,7 +150,7 @@
if(!owner)
return
owner.disabilities &= ~NEARSIGHTED
owner.sdisabilities &= ~BLIND
owner.disabilities &= ~BLIND
owner.eye_blurry = 0
owner.eye_blind = 0