From 8a792d6ef665f2a0b86870c4f258f1654f52119c Mon Sep 17 00:00:00 2001 From: LetterJay Date: Fri, 29 Dec 2017 00:07:36 -0600 Subject: [PATCH] more save points --- code/modules/clothing/glasses/_glasses.dm | 4 --- code/modules/events/disease_outbreak.dm | 4 --- .../mining/lavaland/necropolis_chests.dm | 4 --- code/modules/mob/living/blood.dm | 17 --------- code/modules/mob/living/brain/brain_item.dm | 5 --- code/modules/mob/living/carbon/carbon.dm | 12 ------- .../mob/living/carbon/carbon_defense.dm | 8 ----- code/modules/mob/living/carbon/examine.dm | 4 --- code/modules/mob/living/carbon/human/death.dm | 5 --- .../mob/living/carbon/human/examine.dm | 8 ++--- .../mob/living/carbon/human/human_defense.dm | 5 --- .../mob/living/carbon/human/human_helpers.dm | 4 --- .../mob/living/carbon/human/interactive.dm | 4 --- .../mob/living/carbon/human/inventory.dm | 4 --- .../mob/living/carbon/human/species.dm | 36 +------------------ .../carbon/human/species_types/golems.dm | 4 --- .../mob/living/carbon/human/update_icons.dm | 4 --- .../mob/living/carbon/monkey/combat.dm | 4 --- .../mob/living/carbon/monkey/update_icons.dm | 4 --- .../modules/mob/living/carbon/update_icons.dm | 4 --- code/modules/mob/living/life.dm | 10 +----- code/modules/mob/living/living.dm | 4 --- code/modules/mob/living/living_defense.dm | 28 --------------- code/modules/mob/living/say.dm | 12 ------- .../hostile/megafauna/colossus.dm | 12 ------- code/modules/mob/living/status_procs.dm | 3 -- code/modules/mob/status_procs.dm | 6 ---- code/modules/paperwork/contract.dm | 4 --- code/modules/paperwork/paper.dm | 8 ----- code/modules/paperwork/paperplane.dm | 4 --- code/modules/projectiles/gun.dm | 4 --- .../projectiles/guns/ballistic/revolver.dm | 4 --- code/modules/projectiles/pins.dm | 4 --- .../chemistry/reagents/medicine_reagents.dm | 12 ------- .../chemistry/reagents/toxin_reagents.dm | 4 --- .../spells/spell_types/construct_spells.dm | 4 --- code/modules/surgery/bodyparts/bodyparts.dm | 4 --- code/modules/surgery/bodyparts/head.dm | 4 --- code/modules/surgery/lipoplasty.dm | 4 --- code/modules/surgery/organs/ears.dm | 8 ----- 40 files changed, 4 insertions(+), 283 deletions(-) diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index 070a57c167..7dca5d9b3e 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -41,11 +41,7 @@ /obj/item/clothing/glasses/proc/thermal_overload() if(ishuman(src.loc)) var/mob/living/carbon/human/H = src.loc -<<<<<<< HEAD - if(!(H.disabilities & BLIND)) -======= if(!(H.has_disability(DISABILITY_BLIND))) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind if(H.glasses == src) to_chat(H, "[src] overloads and blinds you!") H.flash_act(visual = 1) diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm index 08a14e96f7..c1cea8224e 100644 --- a/code/modules/events/disease_outbreak.dm +++ b/code/modules/events/disease_outbreak.dm @@ -51,11 +51,7 @@ var/datum/disease/D if(!advanced_virus) if(virus_type == /datum/disease/dnaspread) //Dnaspread needs strain_data set to work. -<<<<<<< HEAD - if(!H.dna || (H.disabilities & BLIND)) //A blindness disease would be the worst. -======= if(!H.dna || (H.has_disability(DISABILITY_BLIND))) //A blindness disease would be the worst. ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind continue D = new virus_type() var/datum/disease/dnaspread/DS = D diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index c96302a871..c081ff4bb3 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -656,11 +656,7 @@ playsound(user, 'sound/magic/clockwork/fellowship_armory.ogg', 35, TRUE, frequency = 90000 - (active * 30000)) /obj/item/melee/transforming/cleaving_saw/clumsy_transform_effect(mob/living/user) -<<<<<<< HEAD - if(user.disabilities & CLUMSY && prob(50)) -======= if(user.has_disability(DISABILITY_CLUMSY) && prob(50)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind to_chat(user, "You accidentally cut yourself with [src], like a doofus!") user.take_bodypart_damage(10) diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm index 50e733a07c..efb7887da2 100644 --- a/code/modules/mob/living/blood.dm +++ b/code/modules/mob/living/blood.dm @@ -16,11 +16,7 @@ /mob/living/carbon/monkey/handle_blood() -<<<<<<< HEAD - if(bodytemperature >= 225 && !(disabilities & NOCLONE)) //cryosleep or husked people do not pump the blood. -======= if(bodytemperature >= 225 && !(has_disability(DISABILITY_NOCLONE))) //cryosleep or husked people do not pump the blood. ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind //Blood regeneration if there is some space if(blood_volume < BLOOD_VOLUME_NORMAL) blood_volume += 0.1 // regenerate blood VERY slowly @@ -31,12 +27,7 @@ if(NOBLOOD in dna.species.species_traits) bleed_rate = 0 return - -<<<<<<< HEAD - if(bodytemperature >= 225 && !(disabilities & NOCLONE)) //cryosleep or husked people do not pump the blood. -======= if(bodytemperature >= 225 && !(has_disability(DISABILITY_NOCLONE))) //cryosleep or husked people do not pump the blood. ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind //Blood regeneration if there is some space if(blood_volume < BLOOD_VOLUME_NORMAL && !(NOHUNGER in dna.species.species_traits)) @@ -209,21 +200,13 @@ return "blood" /mob/living/carbon/monkey/get_blood_id() -<<<<<<< HEAD - if(!(disabilities & NOCLONE)) -======= if(!(has_disability(DISABILITY_NOCLONE))) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind return "blood" /mob/living/carbon/human/get_blood_id() if(dna.species.exotic_blood) return dna.species.exotic_blood -<<<<<<< HEAD - else if((NOBLOOD in dna.species.species_traits) || (disabilities & NOCLONE)) -======= else if((NOBLOOD in dna.species.species_traits) || (has_disability(DISABILITY_NOCLONE))) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind return return "blood" diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm index cf3d351ab8..1ff4ebd47a 100644 --- a/code/modules/mob/living/brain/brain_item.dm +++ b/code/modules/mob/living/brain/brain_item.dm @@ -79,13 +79,8 @@ if(!brainmob.stored_dna) brainmob.stored_dna = new /datum/dna/stored(brainmob) C.dna.copy_dna(brainmob.stored_dna) -<<<<<<< HEAD - if(L.disabilities & NOCLONE) - brainmob.disabilities |= NOCLONE //This is so you can't just decapitate a husked guy and clone them without needing to get a new body -======= if(L.has_disability(DISABILITY_NOCLONE)) brainmob.disabilities[DISABILITY_NOCLONE] = L.disabilities[DISABILITY_NOCLONE] ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind var/obj/item/organ/zombie_infection/ZI = L.getorganslot(ORGAN_SLOT_ZOMBIE) if(ZI) brainmob.set_species(ZI.old_species) //For if the brain is cloned diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 5e2ce2c1c9..2bca491c40 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -157,11 +157,7 @@ if(!throwable_mob.buckled) thrown_thing = throwable_mob stop_pulling() -<<<<<<< HEAD - if(disabilities & PACIFISM) -======= if(has_disability(DISABILITY_PACIFISM)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind to_chat(src, "You gently let go of [throwable_mob].") var/turf/start_T = get_turf(loc) //Get the start and target tile for the descriptors var/turf/end_T = get_turf(target) @@ -174,11 +170,7 @@ thrown_thing = I dropItemToGround(I) -<<<<<<< HEAD - if(disabilities & PACIFISM && I.throwforce) -======= if(has_disability(DISABILITY_PACIFISM) && I.throwforce) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind to_chat(src, "You set [I] down gently on the ground.") return @@ -417,11 +409,7 @@ dropItemToGround(I) var/modifier = 0 -<<<<<<< HEAD - if(disabilities & CLUMSY) -======= if(has_disability(DISABILITY_CLUMSY)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind modifier -= 40 //Clumsy people are more likely to hit themselves -Honk! switch(rand(1,100)+modifier) //91-100=Nothing special happens diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 7b96428621..90502eae40 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -306,18 +306,10 @@ if(eyes.eye_damage > 20) if(prob(eyes.eye_damage - 20)) -<<<<<<< HEAD - if(become_nearsighted()) -======= if(!has_disability(DISABILITY_NEARSIGHT)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind to_chat(src, "Your eyes start to burn badly!") else if(prob(eyes.eye_damage - 25)) -<<<<<<< HEAD - if(become_blind()) -======= if(!has_disability(DISABILITY_BLIND)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind to_chat(src, "You can't see anything!") else to_chat(src, "Your eyes are really starting to hurt. This can't be good for you!") diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm index 03285f4d57..5ef14d5d09 100644 --- a/code/modules/mob/living/carbon/examine.dm +++ b/code/modules/mob/living/carbon/examine.dm @@ -70,11 +70,7 @@ else msg += "[t_He] [t_is] severely deformed!\n" -<<<<<<< HEAD - if(disabilities & DUMB) -======= if(has_disability(DISABILITY_DUMB)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind msg += "[t_He] seem[p_s()] to be clumsy and unable to think.\n" if(fire_stacks > 0) diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 3c6c1d076e..95788da39d 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -48,12 +48,7 @@ /mob/living/carbon/proc/Drain() -<<<<<<< HEAD - become_husk() - disabilities |= NOCLONE -======= become_husk(CHANGELING_DRAIN) add_disability(DISABILITY_NOCLONE, CHANGELING_DRAIN) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind blood_volume = 0 return 1 diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index fae9d41569..bc4fd83334 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -273,7 +273,7 @@ msg += "[t_He] look[p_s()] like a drunken mess.\n" if(91.01 to INFINITY) msg += "[t_He] [t_is] a shitfaced, slobbering wreck.\n" - + for (var/I in src.vore_organs) var/datum/belly/B = vore_organs[I] msg += B.get_examine_msg() @@ -285,11 +285,7 @@ if(stat == UNCONSCIOUS) msg += "[t_He] [t_is]n't responding to anything around [t_him] and seem[p_s()] to be asleep.\n" else -<<<<<<< HEAD - if(disabilities & DUMB) -======= if(has_disability(DISABILITY_DUMB)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind msg += "[t_He] [t_has] a stupid expression on [t_his] face.\n" if(InCritical()) msg += "[t_He] [t_is] barely conscious.\n" @@ -354,7 +350,7 @@ msg += "\[Add comment\]\n" if(print_flavor_text() && get_visible_name() != "Unknown")//Are we sure we know who this is? Don't show flavor text unless we can recognize them. Prevents certain metagaming with impersonation. msg += "[print_flavor_text()]\n" - + msg += "*---------*" to_chat(user, msg) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 1ba1995265..7b0f50041d 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -140,13 +140,8 @@ return ..() /mob/living/carbon/human/grabbedby(mob/living/carbon/user, supress_message = 0) -<<<<<<< HEAD - if(user == src && pulling && !pulling.anchored && grab_state >= GRAB_AGGRESSIVE && isliving(pulling)) - vore_attack(user, pulling) -======= if(user == src && pulling && !pulling.anchored && grab_state >= GRAB_AGGRESSIVE && (has_disability(DISABILITY_FAT)) && ismonkey(pulling)) devour_mob(pulling) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind else ..() diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index 3384dac1b6..7f1d9560e0 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -103,11 +103,7 @@ /mob/living/carbon/human/IsAdvancedToolUser() -<<<<<<< HEAD - if(disabilities & MONKEYLIKE) -======= if(has_disability(DISABILITY_MONKEYLIKE)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind return FALSE return TRUE//Humans can use guns and such diff --git a/code/modules/mob/living/carbon/human/interactive.dm b/code/modules/mob/living/carbon/human/interactive.dm index 7f42e1dcb9..9d4b7a8420 100644 --- a/code/modules/mob/living/carbon/human/interactive.dm +++ b/code/modules/mob/living/carbon/human/interactive.dm @@ -339,11 +339,7 @@ if(TRAITS & TRAIT_SMART) smartness = 75 else if(TRAITS & TRAIT_DUMB) -<<<<<<< HEAD - disabilities |= CLUMSY -======= add_disability(DISABILITY_CLUMSY, GENETIC_MUTATION) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind smartness = 25 if(TRAITS & TRAIT_MEAN) diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index e44303b937..4dd26ebe6b 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -187,11 +187,7 @@ if(G.tint) update_tint() if(G.vision_correction) -<<<<<<< HEAD - if(disabilities & NEARSIGHT) -======= if(has_disability(DISABILITY_NEARSIGHT)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind overlay_fullscreen("nearsighted", /obj/screen/fullscreen/impaired, 1) adjust_eye_damage(0) if(G.vision_flags || G.darkness_view || G.invis_override || G.invis_view || !isnull(G.lighting_alpha)) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 5e8402f1fa..c7dc99720f 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -125,7 +125,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) randname += " [pick(GLOB.last_names)]" return randname - + //Called when cloning, copies some vars that should be kept /datum/species/proc/copy_properties_from(datum/species/old_species) return @@ -312,11 +312,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(!HD) //Decapitated return -<<<<<<< HEAD - if(H.disabilities & HUSK) -======= if(H.has_disability(DISABILITY_HUSK)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind return var/datum/sprite_accessory/S var/list/standing = list() @@ -456,12 +452,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) var/list/standing = list() var/obj/item/bodypart/head/HD = H.get_bodypart("head") - -<<<<<<< HEAD - if(HD && !(H.disabilities & HUSK)) -======= if(HD && !(H.has_disability(DISABILITY_HUSK))) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind // lipstick if(H.lip_style && (LIPS in species_traits)) var/mutable_appearance/lip_overlay = mutable_appearance('icons/mob/human_face.dmi', "lips_[H.lip_style]", -BODY_LAYER) @@ -732,11 +723,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(S.center) accessory_overlay = center_image(accessory_overlay, S.dimension_x, S.dimension_y) -<<<<<<< HEAD - if(!(H.disabilities & HUSK)) -======= if(!(H.has_disability(DISABILITY_HUSK))) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind if(!forced_colour) switch(S.color_src) if(MUTCOLORS) @@ -1113,30 +1100,17 @@ GLOBAL_LIST_EMPTY(roundstart_races) //////// /datum/species/proc/handle_digestion(mob/living/carbon/human/H) - -<<<<<<< HEAD - //The fucking FAT mutation is the dumbest shit ever. It makes the code so difficult to work with - if(H.disabilities & FAT)//I share your pain, past coder. - if(H.overeatduration < 100) - to_chat(H, "You feel fit again!") - H.disabilities &= ~FAT -======= //The fucking DISABILITY_FAT mutation is the dumbest shit ever. It makes the code so difficult to work with if(H.has_disability(DISABILITY_FAT))//I share your pain, past coder. if(H.overeatduration < 100) to_chat(H, "You feel fit again!") H.remove_disability(DISABILITY_FAT, OBESITY) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind H.update_inv_w_uniform() H.update_inv_wear_suit() else if(H.overeatduration > 500) to_chat(H, "You suddenly feel blubbery!") -<<<<<<< HEAD - H.disabilities |= FAT -======= H.add_disability(DISABILITY_FAT, OBESITY) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind H.update_inv_w_uniform() H.update_inv_wear_suit() @@ -1293,11 +1267,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) . += (health_deficiency / 25) if((hungry >= 70) && !flight) //Being hungry won't stop you from using flightpack controls/flapping your wings although it probably will in the wing case but who cares. . += hungry / 50 -<<<<<<< HEAD - if(H.disabilities & FAT) -======= if(H.has_disability(DISABILITY_FAT)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind . += (1.5 - flight) if(H.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT) . += (BODYTEMP_COLD_DAMAGE_LIMIT - H.bodytemperature) / COLD_SLOWDOWN_FACTOR @@ -1343,11 +1313,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) /datum/species/proc/harm(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style) -<<<<<<< HEAD - if(user.disabilities & PACIFISM) -======= if(user.has_disability(DISABILITY_PACIFISM)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind to_chat(user, "You don't want to harm [target]!") return FALSE if(target.check_block()) diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index cd343953eb..90ab0cfceb 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -725,11 +725,7 @@ /obj/structure/cloth_pile/proc/revive() if(QDELETED(src) || QDELETED(cloth_golem)) //QDELETED also checks for null, so if no cloth golem is set this won't runtime return -<<<<<<< HEAD - if(cloth_golem.suiciding || cloth_golem.disabilities & NOCLONE) -======= if(cloth_golem.suiciding || cloth_golem.has_disability(DISABILITY_NOCLONE)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind QDEL_NULL(cloth_golem) return diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 5c4e92dd9d..5684d8eb68 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -609,11 +609,7 @@ generate/load female uniform sprites matching all previously decided variables if(BP.dmg_overlay_type) . += "-[BP.dmg_overlay_type]" -<<<<<<< HEAD - if(disabilities & HUSK) -======= if(has_disability(DISABILITY_HUSK)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind . += "-husk" /mob/living/carbon/human/load_limb_from_cache() diff --git a/code/modules/mob/living/carbon/monkey/combat.dm b/code/modules/mob/living/carbon/monkey/combat.dm index db60922f13..052e8eeaf5 100644 --- a/code/modules/mob/living/carbon/monkey/combat.dm +++ b/code/modules/mob/living/carbon/monkey/combat.dm @@ -122,11 +122,7 @@ if(L == src) return FALSE -<<<<<<< HEAD - if(disabilities & PACIFISM) -======= if(has_disability(DISABILITY_PACIFISM)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind return FALSE if(enemies[L]) diff --git a/code/modules/mob/living/carbon/monkey/update_icons.dm b/code/modules/mob/living/carbon/monkey/update_icons.dm index 9cd99fde8a..1bb4400087 100644 --- a/code/modules/mob/living/carbon/monkey/update_icons.dm +++ b/code/modules/mob/living/carbon/monkey/update_icons.dm @@ -19,11 +19,7 @@ if(!HD) //Decapitated return -<<<<<<< HEAD - if(disabilities & HUSK) -======= if(has_disability(DISABILITY_HUSK)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind return var/hair_hidden = 0 diff --git a/code/modules/mob/living/carbon/update_icons.dm b/code/modules/mob/living/carbon/update_icons.dm index 2e65814d56..147f14c945 100644 --- a/code/modules/mob/living/carbon/update_icons.dm +++ b/code/modules/mob/living/carbon/update_icons.dm @@ -290,11 +290,7 @@ else . += "-robotic" -<<<<<<< HEAD - if(disabilities & HUSK) -======= if(has_disability(DISABILITY_HUSK)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind . += "-husk" diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index 1450d05e2b..0fc19e3882 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -54,7 +54,7 @@ handle_environment(environment) handle_fire() - + // Vore code for belly processes handle_internal_contents() @@ -126,11 +126,7 @@ /mob/living/proc/handle_disabilities() //Eyes if(eye_blind) //blindness, heals slowly over time -<<<<<<< HEAD - if(!stat && !(disabilities & BLIND)) -======= if(!stat && !(has_disability(DISABILITY_BLIND))) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind eye_blind = max(eye_blind-1,0) if(client && !eye_blind) clear_alert("blind") @@ -141,11 +137,7 @@ eye_blurry = max(eye_blurry-1, 0) if(client && !eye_blurry) clear_fullscreen("blurry") -<<<<<<< HEAD - if(disabilities & PACIFISM && a_intent == INTENT_HARM) -======= if(has_disability(DISABILITY_PACIFISM) && a_intent == INTENT_HARM) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind to_chat(src, "You don't feel like harming anybody.") a_intent_change(INTENT_HELP) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 9bdd419bca..4934f684ab 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -819,11 +819,7 @@ if(G.trigger_guard != TRIGGER_GUARD_ALLOW_ALL && !IsAdvancedToolUser()) to_chat(src, "You don't have the dexterity to do this!") return FALSE -<<<<<<< HEAD - if(disabilities & PACIFISM) -======= if(has_disability(DISABILITY_PACIFISM)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind to_chat(src, "You don't want to risk harming anyone!") return FALSE return TRUE diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index f096f3b6fd..cfb700d9d7 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -136,11 +136,7 @@ to_chat(user, "[src] can't be grabbed more aggressively!") return FALSE -<<<<<<< HEAD - if(user.disabilities & PACIFISM) -======= if(user.has_disability(DISABILITY_PACIFISM)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind to_chat(user, "You don't want to risk hurting [src]!") return FALSE @@ -197,11 +193,7 @@ M.Feedstop() return // can't attack while eating! -<<<<<<< HEAD - if(disabilities & PACIFISM) -======= if(has_disability(DISABILITY_PACIFISM)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind to_chat(M, "You don't want to hurt anyone!") return FALSE @@ -218,11 +210,7 @@ M.visible_message("\The [M] [M.friendly] [src]!") return FALSE else -<<<<<<< HEAD - if(M.disabilities & PACIFISM) -======= if(M.has_disability(DISABILITY_PACIFISM)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind to_chat(M, "You don't want to hurt anyone!") return FALSE @@ -241,11 +229,7 @@ return FALSE if (M.a_intent == INTENT_HARM) -<<<<<<< HEAD - if(M.disabilities & PACIFISM) -======= if(M.has_disability(DISABILITY_PACIFISM)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind to_chat(M, "You don't want to hurt anyone!") return FALSE @@ -271,11 +255,7 @@ return FALSE else -<<<<<<< HEAD - if(L.disabilities & PACIFISM) -======= if(L.has_disability(DISABILITY_PACIFISM)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind to_chat(L, "You don't want to hurt anyone!") return @@ -300,11 +280,7 @@ grabbedby(M) return FALSE if("harm") -<<<<<<< HEAD - if(M.disabilities & PACIFISM) -======= if(M.has_disability(DISABILITY_PACIFISM)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind to_chat(M, "You don't want to hurt anyone!") return FALSE M.do_attack_animation(src) @@ -394,11 +370,7 @@ //called when the mob receives a bright flash /mob/living/proc/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /obj/screen/fullscreen/flash) -<<<<<<< HEAD - if(get_eye_protection() < intensity && (override_blindness_check || !(disabilities & BLIND))) -======= if(get_eye_protection() < intensity && (override_blindness_check || !(has_disability(DISABILITY_BLIND)))) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind overlay_fullscreen("flash", type) addtimer(CALLBACK(src, .proc/clear_fullscreen, "flash", 25), 25) return 1 diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index a8227c41bc..b1a5e7f640 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -135,17 +135,9 @@ GLOBAL_LIST_INIT(department_radio_keys, list( // AIs use inherent channels for the holopad. Most inherent channels // ignore the language argument however. -<<<<<<< HEAD - var/datum/saymode/SM = SSradio.saymodes[key] - if(key && SM) - if(!SM.handle_message(src, message, language) && !message_mode) - return - -======= var/datum/saymode/SM = SSradio.saymodes[talk_key] if(SM && !SM.handle_message(src, message, language)) return ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind if(!can_speak_vocal(message)) to_chat(src, "You find yourself unable to speak!") @@ -291,11 +283,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list( return 1 /mob/living/proc/can_speak_vocal(message) //Check AFTER handling of xeno and ling channels -<<<<<<< HEAD - if(disabilities & MUTE) -======= if(has_disability(DISABILITY_MUTE)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind return 0 if(is_muzzled()) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index 45363c9691..9bf2c8c430 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -558,11 +558,7 @@ Difficulty: Very Hard H.regenerate_limbs() H.regenerate_organs() H.revive(1,0) -<<<<<<< HEAD - H.disabilities |= NOCLONE //Free revives, but significantly limits your options for reviving except via the crystal -======= H.add_disability(DISABILITY_NOCLONE, MAGIC_DISABILITY) //Free revives, but significantly limits your options for reviving except via the crystal ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind H.grab_ghost(force = TRUE) /obj/machinery/anomalous_crystal/helpers //Lets ghost spawn as helpful creatures that can only heal people slightly. Incredibly fragile and they can't converse with humans @@ -723,11 +719,7 @@ Difficulty: Very Hard if(isliving(A) && holder_animal) var/mob/living/L = A L.notransform = 1 -<<<<<<< HEAD - L.disabilities |= MUTE -======= L.add_disability(DISABILITY_MUTE, STASIS_MUTE) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind L.status_flags |= GODMODE L.mind.transfer_to(holder_animal) var/obj/effect/proc_holder/spell/targeted/exit_possession/P = new /obj/effect/proc_holder/spell/targeted/exit_possession @@ -737,11 +729,7 @@ Difficulty: Very Hard /obj/structure/closet/stasis/dump_contents(var/kill = 1) STOP_PROCESSING(SSobj, src) for(var/mob/living/L in src) -<<<<<<< HEAD - L.disabilities &= ~MUTE -======= L.remove_disability(DISABILITY_MUTE, STASIS_MUTE) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind L.status_flags &= ~GODMODE L.notransform = 0 if(holder_animal) diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm index a109859222..86719ebb84 100644 --- a/code/modules/mob/living/status_procs.dm +++ b/code/modules/mob/living/status_procs.dm @@ -137,8 +137,6 @@ to_chat(src, "[priority_absorb_key["self_message"]]") priority_absorb_key["stuns_absorbed"] += amount return TRUE -<<<<<<< HEAD -======= /////////////////////////////////// DISABILITIES //////////////////////////////////// @@ -215,4 +213,3 @@ status_flags |= DISFIGURED //makes them unknown update_body() add_disability(DISABILITY_HUSK, source) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind diff --git a/code/modules/mob/status_procs.dm b/code/modules/mob/status_procs.dm index 039c5ca951..2b86a8c6a4 100644 --- a/code/modules/mob/status_procs.dm +++ b/code/modules/mob/status_procs.dm @@ -162,13 +162,10 @@ var/blind_minimum = 0 if((stat != CONSCIOUS && stat != SOFT_CRIT) || (disabilities & BLIND)) blind_minimum = 1 -<<<<<<< HEAD -======= if(isliving(src)) var/mob/living/L = src if(L.has_disability(DISABILITY_BLIND)) blind_minimum = 1 ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind eye_blind = max(eye_blind+amount, blind_minimum) if(!eye_blind) clear_alert("blind") @@ -186,13 +183,10 @@ var/blind_minimum = 0 if((stat != CONSCIOUS && stat != SOFT_CRIT) || (disabilities & BLIND)) blind_minimum = 1 -<<<<<<< HEAD -======= if(isliving(src)) var/mob/living/L = src if(L.has_disability(DISABILITY_BLIND)) blind_minimum = 1 ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind eye_blind = blind_minimum if(!eye_blind) clear_alert("blind") diff --git a/code/modules/paperwork/contract.dm b/code/modules/paperwork/contract.dm index 4d27f920db..1597b7a810 100644 --- a/code/modules/paperwork/contract.dm +++ b/code/modules/paperwork/contract.dm @@ -202,11 +202,7 @@ if(!user.mind.hasSoul) to_chat(user, "You do not possess a soul.") return 0 -<<<<<<< HEAD - if(user.disabilities & DUMB) -======= if(user.has_disability(DISABILITY_DUMB)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind to_chat(user, "You quickly scrawl 'your name' on the contract.") signIncorrectly() return 0 diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 5e4e4744de..9d5b7ce0d5 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -93,11 +93,7 @@ return if(ishuman(usr)) var/mob/living/carbon/human/H = usr -<<<<<<< HEAD - if(H.disabilities & CLUMSY && prob(25)) -======= if(H.has_disability(DISABILITY_CLUMSY) && prob(25)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind to_chat(H, "You cut yourself on the paper! Ahhhh! Ahhhhh!") H.damageoverlaytemp = 9001 H.update_damage_hud() @@ -321,11 +317,7 @@ to_chat(user, "You stamp the paper with your rubber stamp.") if(P.is_hot()) -<<<<<<< HEAD - if(user.disabilities & CLUMSY && prob(10)) -======= if(user.has_disability(DISABILITY_CLUMSY) && prob(10)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind user.visible_message("[user] accidentally ignites themselves!", \ "You miss the paper and accidentally light yourself on fire!") user.dropItemToGround(P) diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm index f74643d2f1..af33dfb28c 100644 --- a/code/modules/paperwork/paperplane.dm +++ b/code/modules/paperwork/paperplane.dm @@ -65,11 +65,7 @@ update_icon() else if(P.is_hot()) -<<<<<<< HEAD - if(user.disabilities & CLUMSY && prob(10)) -======= if(user.has_disability(DISABILITY_CLUMSY) && prob(10)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind user.visible_message("[user] accidentally ignites themselves!", \ "You miss [src] and accidentally light yourself on fire!") user.dropItemToGround(P) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index d3f915907c..5321a8b300 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -158,11 +158,7 @@ //Exclude lasertag guns from the DISABILITY_CLUMSY check. if(clumsy_check) if(istype(user)) -<<<<<<< HEAD - if (user.disabilities & CLUMSY && prob(40)) -======= if (user.has_disability(DISABILITY_CLUMSY) && prob(40)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind to_chat(user, "You shoot yourself in the foot with [src]!") var/shot_leg = pick("l_leg", "r_leg") process_fire(user,user,0,params, zone_override = shot_leg) diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index 8637928867..32b490a8e6 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -349,11 +349,7 @@ clumsy_check = 0 /obj/item/gun/ballistic/revolver/reverse/can_trigger_gun(mob/living/user) -<<<<<<< HEAD - if((user.disabilities & CLUMSY) || (user.mind && user.mind.assigned_role == "Clown")) -======= if((user.has_disability(DISABILITY_CLUMSY)) || (user.mind && user.mind.assigned_role == "Clown")) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind return ..() if(process_fire(user, user, 0, zone_override = "head")) user.visible_message("[user] somehow manages to shoot [user.p_them()]self in the face!", "You somehow shoot yourself in the face! How the hell?!") diff --git a/code/modules/projectiles/pins.dm b/code/modules/projectiles/pins.dm index 40ea23291e..92b2f8c0d4 100644 --- a/code/modules/projectiles/pins.dm +++ b/code/modules/projectiles/pins.dm @@ -129,11 +129,7 @@ // A gun with ultra-honk pin is useful for clown and useless for everyone else. /obj/item/device/firing_pin/clown/ultra/pin_auth(mob/living/user) playsound(src.loc, 'sound/items/bikehorn.ogg', 50, 1) -<<<<<<< HEAD - if(!(user.disabilities & CLUMSY) && !(user.mind && user.mind.assigned_role == "Clown")) -======= if(!(user.has_disability(DISABILITY_CLUMSY)) && !(user.mind && user.mind.assigned_role == "Clown")) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind return 0 return 1 diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 52a7f4cd10..4f4bb6fdd1 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -667,22 +667,14 @@ var/obj/item/organ/eyes/eyes = M.getorganslot(ORGAN_SLOT_EYES) if (!eyes) return -<<<<<<< HEAD - if(M.disabilities & BLIND) -======= if(M.has_disability(DISABILITY_BLIND, EYE_DAMAGE)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind if(prob(20)) to_chat(M, "Your vision slowly returns...") M.cure_blind() M.cure_nearsighted() M.blur_eyes(35) -<<<<<<< HEAD - else if(M.disabilities & NEARSIGHT) -======= else if(M.has_disability(DISABILITY_NEARSIGHT, EYE_DAMAGE)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind to_chat(M, "The blackness in your peripheral vision fades.") M.cure_nearsighted() M.blur_eyes(10) @@ -773,11 +765,7 @@ M.visible_message("[M]'s body convulses a bit, and then falls still once more.") return M.visible_message("[M]'s body convulses a bit.") -<<<<<<< HEAD - if(!M.suiciding && !(M.disabilities & NOCLONE) && !M.hellbound) -======= if(!M.suiciding && !(M.has_disability(DISABILITY_NOCLONE)) && !M.hellbound) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind if(!M) return if(M.notify_ghost_cloning(source = M)) diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index e6771d7db5..6e1e8046fe 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -141,11 +141,7 @@ taste_description = "mint" /datum/reagent/toxin/minttoxin/on_mob_life(mob/living/M) -<<<<<<< HEAD - if(M.disabilities & FAT) -======= if(M.has_disability(DISABILITY_FAT)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind M.gib() return ..() diff --git a/code/modules/spells/spell_types/construct_spells.dm b/code/modules/spells/spell_types/construct_spells.dm index ba3104976e..eca4990290 100644 --- a/code/modules/spells/spell_types/construct_spells.dm +++ b/code/modules/spells/spell_types/construct_spells.dm @@ -214,13 +214,9 @@ target.bodytemperature -= 200 /obj/effect/proc_holder/spell/targeted/abyssal_gaze/proc/cure_blindness(mob/target) -<<<<<<< HEAD - target.adjust_blindness(-5) -======= if(isliving(target)) var/mob/living/L = target L.cure_blind(DISABILITY_BLIND, "abyssal_gaze") ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind /obj/effect/proc_holder/spell/targeted/dominate name = "Dominate" diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm index 6cffe0a939..fa8d04d987 100644 --- a/code/modules/surgery/bodyparts/bodyparts.dm +++ b/code/modules/surgery/bodyparts/bodyparts.dm @@ -217,11 +217,7 @@ C = owner no_update = 0 -<<<<<<< HEAD - if(C.disabilities & HUSK) -======= if(C.has_disability(DISABILITY_HUSK)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind species_id = "husk" //overrides species_id dmg_overlay_type = "" //no damage overlay shown when husked should_draw_gender = FALSE diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm index 8d96f03338..4afe4df220 100644 --- a/code/modules/surgery/bodyparts/head.dm +++ b/code/modules/surgery/bodyparts/head.dm @@ -61,11 +61,7 @@ C = owner real_name = C.real_name -<<<<<<< HEAD - if(C.disabilities & HUSK) -======= if(C.has_disability(DISABILITY_HUSK)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind real_name = "Unknown" hair_style = "Bald" facial_hair_style = "Shaved" diff --git a/code/modules/surgery/lipoplasty.dm b/code/modules/surgery/lipoplasty.dm index d156df8ea0..dfb41f90e0 100644 --- a/code/modules/surgery/lipoplasty.dm +++ b/code/modules/surgery/lipoplasty.dm @@ -4,11 +4,7 @@ possible_locs = list("chest") /datum/surgery/lipoplasty/can_start(mob/user, mob/living/carbon/target) -<<<<<<< HEAD - if(target.disabilities & FAT) -======= if(target.has_disability(DISABILITY_FAT)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind return 1 return 0 diff --git a/code/modules/surgery/organs/ears.dm b/code/modules/surgery/organs/ears.dm index 028b4ed5f1..2a12005956 100644 --- a/code/modules/surgery/organs/ears.dm +++ b/code/modules/surgery/organs/ears.dm @@ -25,11 +25,7 @@ return var/mob/living/carbon/C = owner // genetic deafness prevents the body from using the ears, even if healthy -<<<<<<< HEAD - if(C.disabilities & DEAF) -======= if(C.has_disability(DISABILITY_DEAF)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind deaf = max(deaf, 1) else if(C.ears && (C.ears.flags_2 & HEALS_EARS_2)) @@ -46,11 +42,7 @@ var/mob/living/carbon/C = owner -<<<<<<< HEAD - if(iscarbon(owner) && C.disabilities & DEAF) -======= if(iscarbon(owner) && C.has_disability(DISABILITY_DEAF)) ->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind deaf = 1 /obj/item/organ/ears/proc/adjustEarDamage(ddmg, ddeaf)