From 982102a407ca0058ae7f5b2ec874718cd49d33ba Mon Sep 17 00:00:00 2001 From: Markolie Date: Sun, 22 Feb 2015 19:04:43 +0100 Subject: [PATCH] Standardize mutations --- code/_onclick/click.dm | 4 +- code/_onclick/item_attack.dm | 4 +- code/_onclick/oldcode.dm | 4 +- code/_onclick/other_mobs.dm | 4 +- code/_onclick/telekinesis.dm | 8 +-- code/datums/spells/genetic.dm | 2 +- code/datums/spells/wizard.dm | 2 +- code/game/atoms.dm | 2 +- code/game/atoms_movable.dm | 2 +- code/game/dna/dna_modifier.dm | 4 +- code/game/dna/genes/disabilities.dm | 4 +- code/game/dna/genes/goon_disabilities.dm | 6 +- code/game/dna/genes/goon_powers.dm | 16 ++--- code/game/dna/genes/powers.dm | 26 ++++---- code/game/dna/genes/vg_disabilities.dm | 4 +- code/game/dna/genes/vg_powers.dm | 22 +++---- code/game/gamemodes/changeling/changeling.dm | 4 +- .../gamemodes/changeling/powers/tiny_prick.dm | 2 +- code/game/gamemodes/cult/cult.dm | 2 +- code/game/gamemodes/cult/runes.dm | 4 +- code/game/gamemodes/events/ninja_equipment.dm | 2 +- code/game/gamemodes/revolution/revolution.dm | 2 +- code/game/gamemodes/traitor/traitor.dm | 2 +- code/game/gamemodes/vampire/vampire.dm | 2 +- code/game/gamemodes/wizard/rightandwrong.dm | 4 +- code/game/gamemodes/wizard/spellbook.dm | 4 +- code/game/jobs/job/security.dm | 2 +- code/game/jobs/job/support.dm | 4 +- code/game/machinery/OpTable.dm | 4 +- code/game/machinery/bots/ed209bot.dm | 2 +- code/game/machinery/bots/secbot.dm | 2 +- code/game/machinery/computer/cloning.dm | 2 +- code/game/machinery/iv_drip.dm | 2 +- code/game/machinery/machinery.dm | 2 +- code/game/machinery/programmable_unloader.dm | 2 +- code/game/machinery/wishgranter.dm | 26 ++++---- code/game/mecha/mecha.dm | 2 +- code/game/objects/effects/aliens.dm | 2 +- code/game/objects/effects/effect_system.dm | 2 +- code/game/objects/items.dm | 6 +- code/game/objects/items/devices/flash.dm | 2 +- code/game/objects/items/devices/flashlight.dm | 4 +- code/game/objects/items/devices/scanners.dm | 2 +- code/game/objects/items/weapons/defib.dm | 4 +- .../objects/items/weapons/dna_injector.dm | 2 +- .../objects/items/weapons/grenades/grenade.dm | 2 +- code/game/objects/items/weapons/handcuffs.dm | 2 +- code/game/objects/items/weapons/kitchen.dm | 10 ++-- .../objects/items/weapons/storage/bible.dm | 2 +- .../items/weapons/storage/briefcase.dm | 2 +- .../objects/items/weapons/storage/secure.dm | 2 +- code/game/objects/items/weapons/stunbaton.dm | 2 +- .../objects/items/weapons/surgery_tools.dm | 6 +- .../objects/items/weapons/swords_axes_etc.dm | 10 ++-- code/game/objects/items/weapons/tools.dm | 2 +- code/game/objects/items/weapons/twohanded.dm | 2 +- code/game/objects/items/weapons/weaponry.dm | 2 +- code/game/objects/structures/grille.dm | 2 +- code/game/objects/structures/tables_racks.dm | 8 +-- code/game/objects/structures/window.dm | 2 +- code/game/turfs/simulated/walls.dm | 4 +- code/game/turfs/simulated/walls_reinforced.dm | 2 +- code/modules/admin/verbs/honksquad.dm | 2 +- code/modules/assembly/mousetrap.dm | 6 +- .../awaymissions/mission_code/wildwest.dm | 6 +- code/modules/client/preferences.dm | 4 +- code/modules/mob/living/carbon/alien/alien.dm | 2 +- .../living/carbon/alien/humanoid/humanoid.dm | 2 +- .../mob/living/carbon/alien/humanoid/life.dm | 2 +- .../mob/living/carbon/alien/larva/larva.dm | 4 +- .../mob/living/carbon/alien/larva/life.dm | 2 +- code/modules/mob/living/carbon/alien/life.dm | 2 +- .../living/carbon/alien/special/snakeman.dm | 2 +- code/modules/mob/living/carbon/brain/life.dm | 2 +- code/modules/mob/living/carbon/carbon.dm | 2 +- code/modules/mob/living/carbon/human/death.dm | 6 +- code/modules/mob/living/carbon/human/emote.dm | 8 +-- .../mob/living/carbon/human/examine.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 6 +- .../living/carbon/human/human_attackhand.dm | 4 +- .../mob/living/carbon/human/human_damage.dm | 6 +- .../mob/living/carbon/human/human_movement.dm | 6 +- code/modules/mob/living/carbon/human/life.dm | 30 +++++----- .../living/carbon/human/plasmaman/species.dm | 2 +- code/modules/mob/living/carbon/human/say.dm | 2 +- .../mob/living/carbon/human/update_icons.dm | 26 ++++---- .../mob/living/carbon/metroid/metroid.dm | 4 +- code/modules/mob/living/carbon/monkey/life.dm | 10 ++-- .../mob/living/carbon/monkey/monkey.dm | 2 +- code/modules/mob/living/carbon/species.dm | 8 +-- code/modules/mob/living/damage_procs.dm | 2 +- code/modules/mob/living/living.dm | 10 ++-- code/modules/mob/living/silicon/mommi/life.dm | 2 +- .../mob/living/silicon/robot/component.dm | 2 +- code/modules/mob/living/silicon/robot/life.dm | 2 +- .../modules/mob/living/silicon/robot/robot.dm | 2 +- .../mob/living/simple_animal/constructs.dm | 2 +- .../living/simple_animal/friendly/corgi.dm | 2 +- .../living/simple_animal/friendly/slime.dm | 2 +- code/modules/mob/mob.dm | 2 +- code/modules/mob/mob_grab.dm | 2 +- code/modules/mob/new_player/new_player.dm | 2 +- .../mob/new_player/preferences_setup.dm | 2 +- code/modules/nano/nanoui.dm | 2 +- code/modules/paperwork/paper.dm | 2 +- code/modules/power/lighting.dm | 8 +-- code/modules/projectiles/gun.dm | 6 +- code/modules/reagents/Chemistry-Reagents.dm | 4 +- code/modules/reagents/Chemistry-Recipes.dm | 2 +- .../reagents/reagent_containers/syringes.dm | 4 +- code/modules/recycling/disposal.dm | 2 +- code/modules/virus2/items_devices.dm | 2 +- code/setup.dm | 60 +++++++++---------- 113 files changed, 282 insertions(+), 282 deletions(-) diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 1e14f780704..e6ab97327da 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -170,11 +170,11 @@ if(ishuman(src) && (istype(src:gloves, /obj/item/clothing/gloves/yellow/power)) && a_intent == "harm") PowerGlove(A) if(!mutations.len) return - if((M_LASER in mutations) && a_intent == "harm") + if((LASER in mutations) && a_intent == "harm") LaserEyes(A) // moved into a proc below return else - if(M_TK in mutations) + if(TK in mutations) A.attack_tk(src) /* Restrained ClickOn diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 84351db1821..ab9c788c079 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -51,7 +51,7 @@ ///////////////////////// var/power = force - if(M_HULK in user.mutations) + if(HULK in user.mutations) power *= 2 if(!istype(M, /mob/living/carbon/human)) @@ -160,7 +160,7 @@ if (istype(location, /turf/simulated)) location:add_blood_floor(M) if("fire") - if (!(M_RESIST_COLD in M.mutations)) + if (!(RESIST_COLD in M.mutations)) M.take_organ_damage(0, power) M << "Aargh it burns!" M.updatehealth() diff --git a/code/_onclick/oldcode.dm b/code/_onclick/oldcode.dm index f81c3f9e37f..2d52a26390a 100644 --- a/code/_onclick/oldcode.dm +++ b/code/_onclick/oldcode.dm @@ -347,8 +347,8 @@ src.hand_al(usr, usr.hand) else // ------- YOU ARE CLICKING ON AN OBJECT THAT'S INACCESSIBLE TO YOU AND IS NOT YOUR HUD ------- - if((M_LASER in usr:mutations) && usr:a_intent == "harm" && world.time >= usr.next_move) - // ------- YOU HAVE THE M_LASER MUTATION, YOUR INTENT SET TO HURT AND IT'S BEEN MORE THAN A DECISECOND SINCE YOU LAS TATTACKED ------- + if((LASER in usr:mutations) && usr:a_intent == "harm" && world.time >= usr.next_move) + // ------- YOU HAVE THE LASER MUTATION, YOUR INTENT SET TO HURT AND IT'S BEEN MORE THAN A DECISECOND SINCE YOU LAS TATTACKED ------- var/turf/T = get_turf(usr) var/turf/U = get_turf(src) diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm index 48db14eff84..353d39347b3 100644 --- a/code/_onclick/other_mobs.dm +++ b/code/_onclick/other_mobs.dm @@ -30,13 +30,13 @@ /mob/living/carbon/human/RangedAttack(var/atom/A) if(!gloves && !mutations.len) return var/obj/item/clothing/gloves/G = gloves - if((M_LASER in mutations) && a_intent == "harm") + if((LASER in mutations) && a_intent == "harm") LaserEyes(A) // moved into a proc below else if(istype(G) && G.Touch(A,0)) // for magic gloves return - else if(M_TK in mutations) + else if(TK in mutations) A.attack_tk(src) */ diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index f4785d6d381..3483a630ebd 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -39,13 +39,13 @@ var/const/tk_maxrange = 15 /obj/item/attack_tk(mob/user) if(user.stat || !isturf(loc)) return - if((M_TK in user.mutations) && !user.get_active_hand()) // both should already be true to get here + if((TK in user.mutations) && !user.get_active_hand()) // both should already be true to get here var/obj/item/tk_grab/O = new(src) user.put_in_active_hand(O) O.host = user O.focus_object(src) else - warning("Strange attack_tk(): TK([M_TK in user.mutations]) empty hand([!user.get_active_hand()])") + warning("Strange attack_tk(): TK([TK in user.mutations]) empty hand([!user.get_active_hand()])") return @@ -101,7 +101,7 @@ var/const/tk_maxrange = 15 if(!host || host != user) del(src) return - if(!(M_TK in host.mutations)) + if(!(TK in host.mutations)) del(src) return if(isobj(target) && !isturf(target.loc)) @@ -189,7 +189,7 @@ var/const/tk_maxrange = 15 //equip_to_slot_or_del(obj/item/W, slot, del_on_fail = 1) /* if(istype(user, /mob/living/carbon)) - if(user:mutations & M_TK && get_dist(source, user) <= 7) + if(user:mutations & TK && get_dist(source, user) <= 7) if(user:get_active_hand()) return 0 var/X = source:x var/Y = source:y diff --git a/code/datums/spells/genetic.dm b/code/datums/spells/genetic.dm index 45be50f0b75..6bf167196cd 100644 --- a/code/datums/spells/genetic.dm +++ b/code/datums/spells/genetic.dm @@ -20,7 +20,7 @@ for(var/mob/living/target in targets) for(var/x in mutations) target.mutations.Add(x) - if(x == M_HULK && ishuman(target)) + if(x == HULK && ishuman(target)) target:hulk_time=world.time + duration target.disabilities |= disabilities target.update_mutations() //update target's mutation overlays diff --git a/code/datums/spells/wizard.dm b/code/datums/spells/wizard.dm index 5672052e0a2..ae507556181 100644 --- a/code/datums/spells/wizard.dm +++ b/code/datums/spells/wizard.dm @@ -48,7 +48,7 @@ include_user = 1 centcom_cancast = 0 - mutations = list(M_LASER, M_HULK) + mutations = list(LASER, HULK) duration = 300 cooldown_min = 300 //25 deciseconds reduction per rank diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 2a7f975e46b..fa22e742970 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -295,7 +295,7 @@ its easier to just keep the beam vertical. add_fibers(M) //He has no prints! - if (M_FINGERPRINTS in M.mutations) + if (FINGERPRINTS in M.mutations) if(fingerprintslast != M.key) fingerprintshidden += "(Has no fingerprints) Real name: [M.real_name], Key: [M.key]" fingerprintslast = M.key diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 5d4a4539e65..e509a47851e 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -108,7 +108,7 @@ src.throw_source = get_turf(src) //store the origin turf if(usr) - if(M_HULK in usr.mutations) + if(HULK in usr.mutations) src.throwing = 2 // really strong throw! var/dist_x = abs(target.x - src.x) diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index 2aacd6e3dd9..4394d699275 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -504,7 +504,7 @@ occupantData["name"] = connected.occupant.name occupantData["stat"] = connected.occupant.stat occupantData["isViableSubject"] = 1 - if ((M_NOCLONE in connected.occupant.mutations && connected.scan_level < 3) || !src.connected.occupant.dna) + if ((NOCLONE in connected.occupant.mutations && connected.scan_level < 3) || !src.connected.occupant.dna) occupantData["isViableSubject"] = 0 occupantData["health"] = connected.occupant.health occupantData["maxHealth"] = connected.occupant.maxHealth @@ -843,7 +843,7 @@ return 1 if (bufferOption == "transfer") - if (!src.connected.occupant || (M_NOCLONE in src.connected.occupant.mutations && connected.scan_level < 3) || !src.connected.occupant.dna) + if (!src.connected.occupant || (NOCLONE in src.connected.occupant.mutations && connected.scan_level < 3) || !src.connected.occupant.dna) return irradiating = 2 diff --git a/code/game/dna/genes/disabilities.dm b/code/game/dna/genes/disabilities.dm index eaf4500359e..cc443ade3f0 100644 --- a/code/game/dna/genes/disabilities.dm +++ b/code/game/dna/genes/disabilities.dm @@ -55,7 +55,7 @@ name="Hallucinate" activation_message="Your mind says 'Hello'." deactivation_message ="Sanity returns. Or does it?" - mutation=M_HALLUCINATE + mutation=HALLUCINATE New() block=HALLUCINATIONBLOCK @@ -82,7 +82,7 @@ name="Clumsiness" activation_message="You feel lightheaded." deactivation_message ="You regain some control of your movements" - mutation=M_CLUMSY + mutation=CLUMSY New() block=CLUMSYBLOCK diff --git a/code/game/dna/genes/goon_disabilities.dm b/code/game/dna/genes/goon_disabilities.dm index 1214919a441..abd64146b1f 100644 --- a/code/game/dna/genes/goon_disabilities.dm +++ b/code/game/dna/genes/goon_disabilities.dm @@ -57,7 +57,7 @@ activation_message = "You feel blubbery and lethargic!" deactivation_message = "You feel fit!" - mutation = M_OBESITY + mutation = OBESITY New() ..() @@ -219,7 +219,7 @@ deactivation_message = "Your stomach stops acting up. Phew!" instability=2 - mutation = M_TOXIC_FARTS + mutation = TOXIC_FARTS New() ..() @@ -237,7 +237,7 @@ activation_message = "You feel buff!" deactivation_message = "You feel wimpy and weak." - mutation = M_STRONG + mutation = STRONG New() ..() diff --git a/code/game/dna/genes/goon_powers.dm b/code/game/dna/genes/goon_powers.dm index 00a7879906f..c154d8f9249 100644 --- a/code/game/dna/genes/goon_powers.dm +++ b/code/game/dna/genes/goon_powers.dm @@ -6,7 +6,7 @@ activation_messages=list("You feel unusually sober.") deactivation_messages = list("You feel like you could use a stiff drink.") - mutation=M_SOBER + mutation=SOBER New() block=SOBERBLOCK @@ -19,7 +19,7 @@ deactivation_messages = list("You feel oddly exposed.") instability=2 - mutation=M_PSY_RESIST + mutation=PSY_RESIST New() block=PSYRESISTBLOCK @@ -149,7 +149,7 @@ usr << "\red This will only work on normal organic beings." return - if (M_RESIST_COLD in C.mutations) + if (RESIST_COLD in C.mutations) C.visible_message("\red A cloud of fine ice crystals engulfs [C.name], but disappears almost instantly!") return var/handle_suit = 0 @@ -392,7 +392,7 @@ else usr.pixel_y -= 8 sleep(1) - if (M_FAT in usr.mutations && prob(66)) + if (FAT in usr.mutations && prob(66)) usr.visible_message("\red [usr.name] crashes due to their heavy weight!") //playsound(usr.loc, 'zhit.wav', 50, 1) usr.weakened += 10 @@ -481,7 +481,7 @@ activation_messages = list("You suddenly notice more about others than you did before.") deactivation_messages = list("You no longer feel able to sense intentions.") instability=1 - mutation=M_EMPATH + mutation=EMPATH New() ..() @@ -514,7 +514,7 @@ usr << "\red You may only use this on other organic beings." return - if (M_PSY_RESIST in M.mutations) + if (PSY_RESIST in M.mutations) usr << "\red You can't see into [M.name]'s mind at all!" return @@ -578,7 +578,7 @@ usr << "\blue Numbers: You sense the number[numbers.len>1?"s":""] [english_list(numbers)] [numbers.len>1?"are":"is"] important to [M.name]." usr << "\blue Thoughts: [M.name] is currently [thoughts]." - if (M_EMPATH in M.mutations) + if (EMPATH in M.mutations) M << "\red You sense [usr.name] reading your mind." else if (prob(5) || M.mind.assigned_role=="Chaplain") M << "\red You sense someone intruding upon your thoughts..." @@ -594,7 +594,7 @@ deactivation_messages = list("You no longer feel gassy. What a relief!") instability=1 - mutation = M_SUPER_FART + mutation = SUPER_FART New() ..() diff --git a/code/game/dna/genes/powers.dm b/code/game/dna/genes/powers.dm index 81d20456736..61068c81701 100644 --- a/code/game/dna/genes/powers.dm +++ b/code/game/dna/genes/powers.dm @@ -5,7 +5,7 @@ /datum/dna/gene/basic/nobreath name="No Breathing" activation_messages=list("You feel no need to breathe.") - mutation=M_NO_BREATH + mutation=NO_BREATH instability=2 New() @@ -15,7 +15,7 @@ /datum/dna/gene/basic/regenerate name="Regenerate" activation_messages=list("You feel better.") - mutation=M_REGEN + mutation=REGEN instability=2 New() @@ -24,7 +24,7 @@ /datum/dna/gene/basic/increaserun name="Super Speed" activation_messages=list("Your leg muscles pulsate.") - mutation=M_RUN + mutation=RUN instability=1 New() @@ -34,7 +34,7 @@ /datum/dna/gene/basic/heat_resist name="Heat Resistance" activation_messages=list("Your skin is icy to the touch.") - mutation=M_RESIST_HEAT + mutation=RESIST_HEAT instability=2 New() @@ -45,7 +45,7 @@ return !(/datum/dna/gene/basic/cold_resist in M.active_genes) // Probability check var/_prob = 15 - if(M_RESIST_COLD in M.mutations) + if(RESIST_COLD in M.mutations) _prob=5 if(probinj(_prob,(flags&MUTCHK_FORCED))) return 1 @@ -56,7 +56,7 @@ /datum/dna/gene/basic/cold_resist name="Cold Resistance" activation_messages=list("Your body is filled with warmth.") - mutation=M_RESIST_COLD + mutation=RESIST_COLD instability=2 New() @@ -67,7 +67,7 @@ return !(/datum/dna/gene/basic/heat_resist in M.active_genes) // Probability check var/_prob=30 - if(M_RESIST_HEAT in M.mutations) + if(RESIST_HEAT in M.mutations) _prob=5 if(probinj(_prob,(flags&MUTCHK_FORCED))) return 1 @@ -78,7 +78,7 @@ /datum/dna/gene/basic/noprints name="No Prints" activation_messages=list("Your fingers feel numb.") - mutation=M_FINGERPRINTS + mutation=FINGERPRINTS instability=1 New() @@ -87,7 +87,7 @@ /datum/dna/gene/basic/noshock name="Shock Immunity" activation_messages=list("Your skin feels strange.") - mutation=M_NO_SHOCK + mutation=NO_SHOCK instability=2 New() @@ -96,7 +96,7 @@ /datum/dna/gene/basic/midget name="Midget" activation_messages=list("Your skin feels rubbery.") - mutation=M_DWARF + mutation=DWARF instability=1 New() @@ -104,7 +104,7 @@ can_activate(var/mob/M,var/flags) // Can't be big and small. - if(M_HULK in M.mutations) + if(HULK in M.mutations) return 0 return ..(M,flags) @@ -115,7 +115,7 @@ /datum/dna/gene/basic/xray name="X-Ray Vision" activation_messages=list("The walls suddenly disappear.") - mutation=M_XRAY + mutation=XRAY instability=2 New() @@ -124,7 +124,7 @@ /datum/dna/gene/basic/tk name="Telekenesis" activation_messages=list("You feel smarter.") - mutation=M_TK + mutation=TK activation_prob=15 instability=5 diff --git a/code/game/dna/genes/vg_disabilities.dm b/code/game/dna/genes/vg_disabilities.dm index ad6c103f429..7cccad7d6ee 100644 --- a/code/game/dna/genes/vg_disabilities.dm +++ b/code/game/dna/genes/vg_disabilities.dm @@ -30,7 +30,7 @@ can_activate(var/mob/M,var/flags) // No loud whispering. - if(M_LOUD in M.mutations) + if(LOUD in M.mutations) return 0 return ..(M,flags) @@ -51,5 +51,5 @@ OnMobLife(var/mob/living/carbon/human/M) if(!istype(M)) return - if(M_DIZZY in M.mutations) + if(DIZZY in M.mutations) M.Dizzy(300) diff --git a/code/game/dna/genes/vg_powers.dm b/code/game/dna/genes/vg_powers.dm index b4bdee1b464..2b45360f613 100644 --- a/code/game/dna/genes/vg_powers.dm +++ b/code/game/dna/genes/vg_powers.dm @@ -26,12 +26,12 @@ Obviously, requires DNA2. can_activate(var/mob/M,var/flags) // Can't be big AND small. - if(M_DWARF in M.mutations) + if(DWARF in M.mutations) return 0 return ..(M,flags) OnDrawUnderlays(var/mob/M,var/g,var/fat) - if(M_HULK in M.mutations) + if(HULK in M.mutations) if(fat) return "hulk_[fat]_s" else @@ -40,11 +40,11 @@ Obviously, requires DNA2. OnMobLife(var/mob/living/carbon/human/M) if(!istype(M)) return - if(M_HULK in M.mutations) + if(HULK in M.mutations) var/timeleft=M.hulk_time - world.time if(M.health <= 25 || timeleft <= 0) M.hulk_time=0 // Just to be sure. - M.mutations.Remove(M_HULK) + M.mutations.Remove(HULK) //M.dna.SetSEState(HULKBLOCK,0) M.update_mutations() //update our mutation overlays M.update_body() @@ -78,7 +78,7 @@ Obviously, requires DNA2. return var/mob/living/carbon/human/M=usr M.hulk_time = world.time + HULK_DURATION - M.mutations.Add(M_HULK) + M.mutations.Add(HULK) M.update_mutations() //update our mutation overlays M.update_body() //M.say(pick("",";")+pick("HULK MAD","YOU MADE HULK ANGRY")) // Just a note to security. @@ -98,7 +98,7 @@ Obviously, requires DNA2. deactivation_messages = list("You body feels normal.") - mutation=M_MORPH + mutation=MORPH instability=2 New() @@ -197,7 +197,7 @@ Obviously, requires DNA2. /datum/dna/gene/basic/grant_spell/remotetalk name="Telepathy" activation_messages=list("You expand your mind outwards.") - mutation=M_REMOTE_TALK + mutation=REMOTE_TALK instability=1 spelltype =/obj/effect/proc_holder/spell/wizard/targeted/remotetalk @@ -244,7 +244,7 @@ Obviously, requires DNA2. var/say = strip_html(input("What do you wish to say")) for(var/mob/living/target in targets) - if(M_REMOTE_TALK in target.mutations) + if(REMOTE_TALK in target.mutations) target.show_message("\blue You hear [usr.real_name]'s voice: [say]") else target.show_message("\blue You hear a voice that seems to echo around the room: [say]") @@ -257,7 +257,7 @@ Obviously, requires DNA2. /datum/dna/gene/basic/grant_spell/remoteview name="Remote Viewing" activation_messages=list("Your mind expands.") - mutation=M_REMOTE_VIEW + mutation=REMOTE_VIEW instability=3 spelltype =/obj/effect/proc_holder/spell/wizard/targeted/remoteview @@ -283,7 +283,7 @@ Obviously, requires DNA2. var/list/targets = living_mob_list var/list/remoteviewers = new /list() for(var/mob/M in targets) - if(M_REMOTE_VIEW in M.mutations) + if(REMOTE_VIEW in M.mutations) remoteviewers += M if(!remoteviewers.len || remoteviewers.len == 1) usr << "No valid targets with remote view were found!" @@ -316,7 +316,7 @@ Obviously, requires DNA2. for(var/mob/living/L in targets) if(ishuman(L)) var/mob/living/carbon/human/H = L - if(M_PSY_RESIST in H.mutations) + if(PSY_RESIST in H.mutations) continue target = L diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index d981da20efe..5108beb041b 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -148,7 +148,7 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" if (changeling.current.mind) if (changeling.current.mind.assigned_role == "Clown") changeling.current << "You have evolved beyond your clownish nature, allowing you to wield weapons without harming yourself." - changeling.current.mutations.Remove(M_CLUMSY) + changeling.current.mutations.Remove(CLUMSY) var/obj_count = 1 for(var/datum/objective/objective in changeling.objectives) @@ -294,7 +294,7 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" user << "[T] is not compatible with our biology." return - if((M_NOCLONE || SKELETON || M_HUSK) in T.mutations) + if((NOCLONE || SKELETON || HUSK) in T.mutations) user << "DNA of [target] is ruined beyond usability!" return diff --git a/code/game/gamemodes/changeling/powers/tiny_prick.dm b/code/game/gamemodes/changeling/powers/tiny_prick.dm index d7820d11188..6158b8672bd 100644 --- a/code/game/gamemodes/changeling/powers/tiny_prick.dm +++ b/code/game/gamemodes/changeling/powers/tiny_prick.dm @@ -82,7 +82,7 @@ /obj/effect/proc_holder/changeling/sting/transformation/can_sting(var/mob/user, var/mob/target) if(!..()) return - if((M_HUSK in target.mutations) || (!ishuman(target) && !ismonkey(target))) + if((HUSK in target.mutations) || (!ishuman(target) && !ismonkey(target))) user << "Our sting appears ineffective against its DNA." return 0 if(ishuman(target)) diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 473afa46c1e..c856fbd4b18 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -132,7 +132,7 @@ if (mob.mind) if (mob.mind.assigned_role == "Clown") mob << "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself." - mob.mutations.Remove(M_CLUMSY) + mob.mutations.Remove(CLUMSY) add_cult_viewpoint(mob) // give them a viewpoint diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 6609005f935..a09804ac74e 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -1019,7 +1019,7 @@ var/list/sacrificed = list() if(iscarbon(L)) var/mob/living/carbon/C = L flick("e_flash", C.flash) - if(C.stuttering < 1 && (!(M_HULK in C.mutations))) + if(C.stuttering < 1 && (!(HULK in C.mutations))) C.stuttering = 1 C.Weaken(1) C.Stun(1) @@ -1046,7 +1046,7 @@ var/list/sacrificed = list() else if(iscarbon(T)) var/mob/living/carbon/C = T flick("e_flash", C.flash) - if (!(M_HULK in C.mutations)) + if (!(HULK in C.mutations)) C.silent += 15 C.Weaken(25) C.Stun(25) diff --git a/code/game/gamemodes/events/ninja_equipment.dm b/code/game/gamemodes/events/ninja_equipment.dm index a02fc5042e7..8ea5ab28f8c 100644 --- a/code/game/gamemodes/events/ninja_equipment.dm +++ b/code/game/gamemodes/events/ninja_equipment.dm @@ -1555,7 +1555,7 @@ It is possible to destroy the net by the occupant or someone else. return attack_hand() - if (M_HULK in usr.mutations) + if (HULK in usr.mutations) usr << text("\blue You easily destroy the energy net.") for(var/mob/O in oviewers(src)) O.show_message(text("\red [] rips the energy net apart!", usr), 1) diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 56ae8c531a0..cb04e55949a 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -183,7 +183,7 @@ if (mob.mind) if (mob.mind.assigned_role == "Clown") mob << "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself." - mob.mutations.Remove(M_CLUMSY) + mob.mutations.Remove(CLUMSY) var/obj/item/device/flash/T = new(mob) diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index e5c19a016be..926627a4a01 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -301,7 +301,7 @@ if (traitor_mob.mind) if (traitor_mob.mind.assigned_role == "Clown") traitor_mob << "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself." - traitor_mob.mutations.Remove(M_CLUMSY) + traitor_mob.mutations.Remove(CLUMSY) // find a radio! toolbox(es), backpack, belt, headset var/obj/item/R = locate(/obj/item/device/pda) in traitor_mob.contents //Hide the uplink in a PDA if available, otherwise radio diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm index 42eb879c5be..32541587e28 100644 --- a/code/game/gamemodes/vampire/vampire.dm +++ b/code/game/gamemodes/vampire/vampire.dm @@ -193,7 +193,7 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha if (vampire.current.mind) if (vampire.current.mind.assigned_role == "Clown") vampire.current << "Your lust for blood has allowed you to overcome your clumsy nature allowing you to wield weapons without harming yourself." - vampire.current.mutations.Remove(M_CLUMSY) + vampire.current.mutations.Remove(CLUMSY) var/obj_count = 1 for(var/datum/objective/objective in vampire.objectives) diff --git a/code/game/gamemodes/wizard/rightandwrong.dm b/code/game/gamemodes/wizard/rightandwrong.dm index 3562603df8d..529e2ddce84 100644 --- a/code/game/gamemodes/wizard/rightandwrong.dm +++ b/code/game/gamemodes/wizard/rightandwrong.dm @@ -111,8 +111,8 @@ new /obj/item/clothing/head/helmet/space/rig/wizard(get_turf(H)) if("scrying") new /obj/item/weapon/scrying(get_turf(H)) - if (!(M_XRAY in H.mutations)) - H.mutations.Add(M_XRAY) + if (!(XRAY in H.mutations)) + H.mutations.Add(XRAY) H.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS) H.see_in_dark = 8 H.see_invisible = SEE_INVISIBLE_LEVEL_TWO diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 5beafdeb055..19a1ea895fb 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -366,8 +366,8 @@ if("scrying") feedback_add_details("wizard_spell_learned","SO") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells new /obj/item/weapon/scrying(get_turf(H)) - if (!(M_XRAY in H.mutations)) - H.mutations.Add(M_XRAY) + if (!(XRAY in H.mutations)) + H.mutations.Add(XRAY) H.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS) H.see_in_dark = 8 H.see_invisible = SEE_INVISIBLE_LEVEL_TWO diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 3962f5a7b39..45d19411b32 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -147,7 +147,7 @@ L.part = affected H.dna.SetSEState(SOBERBLOCK,1) - H.mutations += M_SOBER + H.mutations += SOBER H.check_mutations = 1 return 1 diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm index 7c022c8466d..00d74b109e9 100644 --- a/code/game/jobs/job/support.dm +++ b/code/game/jobs/job/support.dm @@ -31,7 +31,7 @@ H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) H.dna.SetSEState(SOBERBLOCK,1) - H.mutations += M_SOBER + H.mutations += SOBER H.check_mutations = 1 return 1 @@ -226,7 +226,7 @@ H.equip_or_collect(new /obj/item/toy/crayon/rainbow(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/storage/fancy/crayons(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/reagent_containers/spray/waterflower(H), slot_in_backpack) - H.mutations.Add(M_CLUMSY) + H.mutations.Add(CLUMSY) return 1 diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm index a3c44bf7fb7..ac873e13158 100644 --- a/code/game/machinery/OpTable.dm +++ b/code/game/machinery/OpTable.dm @@ -43,7 +43,7 @@ del(src) /obj/machinery/optable/attack_paw(mob/user as mob) - if ((M_HULK in usr.mutations)) + if ((HULK in usr.mutations)) usr << text("\blue You destroy the operating table.") visible_message("\red [usr] destroys the operating table!") src.density = 0 @@ -56,7 +56,7 @@ return /obj/machinery/optable/attack_hand(mob/user as mob) - if (M_HULK in usr.mutations) + if (HULK in usr.mutations) usr << text("\blue You destroy the table.") visible_message("\red [usr] destroys the operating table!") src.density = 0 diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm index bffd8a07032..78e9eaf4a72 100644 --- a/code/game/machinery/bots/ed209bot.dm +++ b/code/game/machinery/bots/ed209bot.dm @@ -257,7 +257,7 @@ Auto Patrol[]"}, icon_state = "[lasercolor]ed209[on]" var/mob/living/carbon/M = target if(istype(M, /mob/living/carbon/human)) - if( M.stuttering < 5 && !(M_HULK in M.mutations) ) + if( M.stuttering < 5 && !(HULK in M.mutations) ) M.stuttering = 5 M.Stun(5) M.Weaken(5) diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm index 2b70de39797..39d574960ef 100644 --- a/code/game/machinery/bots/secbot.dm +++ b/code/game/machinery/bots/secbot.dm @@ -241,7 +241,7 @@ Auto Patrol: []"}, icon_state = "[base_icon][on]" var/mob/living/carbon/M = target if(istype(M, /mob/living/carbon/human)) - if( M.stuttering < 5 && !(M_HULK in M.mutations) ) + if( M.stuttering < 5 && !(HULK in M.mutations) ) M.stuttering = 5 if(harmbaton) // Bots with harmbaton enabled become shitcurity. - Dave M.apply_damage(10) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index e197042437f..f82d313a545 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -329,7 +329,7 @@ scantemp = "Error: Mental interface failure." nanomanager.update_uis(src) return - if ((M_NOCLONE in subject.mutations) && src.scanner.scan_level < 2) + if ((NOCLONE in subject.mutations) && src.scanner.scan_level < 2) scantemp = "Error: Mental interface failure." nanomanager.update_uis(src) return diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 4063396f5c5..4a8401506f0 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -110,7 +110,7 @@ if(!istype(T)) return if(!T.dna) return - if(M_NOCLONE in T.mutations) + if(NOCLONE in T.mutations) return if(T.species && T.species.flags & NO_BLOOD) diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 7d9eb50d44b..e30776ef6b4 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -218,7 +218,7 @@ Class Procs: if(restrained() || lying || stat || stunned || weakened) return if(be_close && !in_range(M, src)) - if(M_TK in mutations) + if(TK in mutations) var/mob/living/carbon/human/H = M if(istype(H.l_hand, /obj/item/tk_grab) || istype(H.r_hand, /obj/item/tk_grab)) return 1 diff --git a/code/game/machinery/programmable_unloader.dm b/code/game/machinery/programmable_unloader.dm index f2aaefc03fa..a7644de5939 100644 --- a/code/game/machinery/programmable_unloader.dm +++ b/code/game/machinery/programmable_unloader.dm @@ -510,7 +510,7 @@ return playsound(loc, "punch", 25, 1, -1) - if(M_HULK in H.mutations) damage += 5 + if(HULK in H.mutations) damage += 5 if(damage < 5) visible_message("[H] gives \the [src] a weak punch.") diff --git a/code/game/machinery/wishgranter.dm b/code/game/machinery/wishgranter.dm index 87561d447ab..c253dd2d084 100644 --- a/code/game/machinery/wishgranter.dm +++ b/code/game/machinery/wishgranter.dm @@ -58,29 +58,29 @@ charges-- insisting = 0 - if (!(M_HULK in user.mutations)) + if (!(HULK in user.mutations)) user.dna.SetSEState(HULKBLOCK,1) - if (!(M_LASER in user.mutations)) - user.mutations.Add(M_LASER) + if (!(LASER in user.mutations)) + user.mutations.Add(LASER) - if (!(M_XRAY in user.mutations)) - user.mutations.Add(M_XRAY) + if (!(XRAY in user.mutations)) + user.mutations.Add(XRAY) user.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS) user.see_in_dark = 8 user.see_invisible = SEE_INVISIBLE_LEVEL_TWO - if (!(M_RESIST_COLD in user.mutations)) - user.mutations.Add(M_RESIST_COLD) + if (!(RESIST_COLD in user.mutations)) + user.mutations.Add(RESIST_COLD) - if (!(M_RESIST_HEAT in user.mutations)) - user.mutations.Add(M_RESIST_HEAT) + if (!(RESIST_HEAT in user.mutations)) + user.mutations.Add(RESIST_HEAT) - if (!(M_TK in user.mutations)) - user.mutations.Add(M_TK) + if (!(TK in user.mutations)) + user.mutations.Add(TK) - if(!(M_REGEN in user.mutations)) - user.mutations.Add(M_REGEN) + if(!(REGEN in user.mutations)) + user.mutations.Add(REGEN) user.update_mutations() diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 398c297cb24..5c9616e0e61 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -461,7 +461,7 @@ call(/obj/item/clothing/gloves/space_ninja/proc/drain)("MECHA",src,user:wear_suit) return - if ((M_HULK in user.mutations) && !prob(src.deflect_chance)) + if ((HULK in user.mutations) && !prob(src.deflect_chance)) src.take_damage(15) src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST)) user.visible_message("[user] hits [src.name], doing some damage.", "You hit [src.name] with all your might. The metal creaks and bends.") diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm index c3a05eae825..34f0ca4a1ff 100644 --- a/code/game/objects/effects/aliens.dm +++ b/code/game/objects/effects/aliens.dm @@ -101,7 +101,7 @@ /obj/structure/alien/resin/attack_hand(mob/living/user) - if(M_HULK in user.mutations) + if(HULK in user.mutations) user.visible_message("[user] destroys [src]!") health = 0 healthcheck() diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index 4440c825215..9f4ea816502 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -1074,7 +1074,7 @@ steam.start() -- spawns the effect return attack_hand(var/mob/user) - if ((M_HULK in user.mutations) || (prob(75 - metal*25))) + if ((HULK in user.mutations) || (prob(75 - metal*25))) user << "\blue You smash through the metal foam wall." for(var/mob/O in oviewers(user)) if ((O.client && !( O.blinded ))) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 9f3f7548d5a..1999d73dba3 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -126,7 +126,7 @@ if(5.0) size = "huge" else - //if ((M_CLUMSY in usr.mutations) && prob(50)) t = "funny-looking" + //if ((CLUMSY in usr.mutations) && prob(50)) t = "funny-looking" usr << "This is a [src.blood_DNA ? "bloody " : ""]\icon[src][src.name]. It is a [size] item." if(src.desc) usr << src.desc @@ -300,7 +300,7 @@ if(istype(src, /obj/item/clothing/under) || istype(src, /obj/item/clothing/suit)) - if(M_FAT in H.mutations) + if(FAT in H.mutations) testing("[M] TOO FAT TO WEAR [src]!") if(!(flags & ONESIZEFITSALL)) if(!disable_warning) @@ -612,7 +612,7 @@ M.LAssailant = user src.add_fingerprint(user) - //if((M_CLUMSY in user.mutations) && prob(50)) + //if((CLUMSY in user.mutations) && prob(50)) // M = user /* M << "\red You stab yourself in the eye." diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index fe322e30dbd..8643a20aaa5 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -16,7 +16,7 @@ /obj/item/device/flash/proc/clown_check(mob/user) - if(user && (M_CLUMSY in user.mutations) && prob(50)) + if(user && (CLUMSY in user.mutations) && prob(50)) flash_carbon(user, user, 15, 0) return 0 return 1 diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 10c31d54773..05a851b0d28 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -49,7 +49,7 @@ add_fingerprint(user) if(on && user.zone_sel.selecting == "eyes") - if(((M_CLUMSY in user.mutations) || user.getBrainLoss() >= 60) && prob(50)) //too dumb to use flashlight properly + if(((CLUMSY in user.mutations) || user.getBrainLoss() >= 60) && prob(50)) //too dumb to use flashlight properly return ..() //just hit them in the head if(!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") //don't have dexterity @@ -77,7 +77,7 @@ if(istype(M, /mob/living/carbon/human) || istype(M, /mob/living/carbon/monkey)) //robots and aliens are unaffected if(M.stat == DEAD || M.sdisabilities & BLIND) //mob is dead or fully blind user << "[M] pupils does not react to the light!" - else if(M_XRAY in M.mutations) //mob has X-RAY vision + else if(XRAY in M.mutations) //mob has X-RAY vision flick("flash", M.flash) //Yes, you can still get flashed wit X-Ray. user << "[M] pupils give an eerie glow!" else //they're okay! diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 097c60d57df..92cfb499ad0 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -110,7 +110,7 @@ REAGENT SCANNER /obj/item/device/healthanalyzer/attack(mob/living/M as mob, mob/living/user as mob) - if (( (M_CLUMSY in user.mutations) || user.getBrainLoss() >= 60) && prob(50)) + if (( (CLUMSY in user.mutations) || user.getBrainLoss() >= 60) && prob(50)) user << text("\red You try to analyze the floor's vitals!") for(var/mob/O in viewers(M, null)) O.show_message(text("\red [user] has analyzed the floor's vitals!"), 1) diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index 377ff97902a..8ca204de283 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -363,7 +363,7 @@ for(var/datum/organ/external/O in H.organs) total_brute += O.brute_dam total_burn += O.burn_dam - if(H.health <= config.health_threshold_dead && total_burn <= 180 && total_brute <= 180 && !H.suiciding && !ghost && tplus < tlimit && !(M_NOCLONE in H.mutations)) + if(H.health <= config.health_threshold_dead && total_burn <= 180 && total_brute <= 180 && !H.suiciding && !ghost && tplus < tlimit && !(NOCLONE in H.mutations)) tobehealed = health + threshold tobehealed -= 5 //They get 5 of each type of damage healed so excessive combined damage will not immediately kill them after they get revived H.adjustOxyLoss(tobehealed) @@ -471,7 +471,7 @@ for(var/datum/organ/external/O in H.organs) total_brute += O.brute_dam total_burn += O.burn_dam - if(H.health <= config.health_threshold_dead && total_burn <= 180 && total_brute <= 180 && !H.suiciding && !ghost && tplus < tlimit && !(M_NOCLONE in H.mutations)) + if(H.health <= config.health_threshold_dead && total_burn <= 180 && total_brute <= 180 && !H.suiciding && !ghost && tplus < tlimit && !(NOCLONE in H.mutations)) tobehealed = health + threshold tobehealed -= 5 //They get 5 of each type of damage healed so excessive combined damage will not immediately kill them after they get revived H.adjustOxyLoss(tobehealed) diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index 3cc4caebb33..19dc7b0850e 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -67,7 +67,7 @@ if(istype(M,/mob/living)) M.apply_effect(rand(5,20),IRRADIATE,0) - if (!(M_NOCLONE in M.mutations)) // prevents drained people from having their DNA changed + if (!(NOCLONE in M.mutations)) // prevents drained people from having their DNA changed // UI in syringe. if (buf.types & DNA2_BUF_UI) if (!block) //isolated block? diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index 5b5e25ff384..44fd37c2680 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -14,7 +14,7 @@ var/display_timer = 1 /obj/item/weapon/grenade/proc/clown_check(var/mob/living/user) - if((M_CLUMSY in user.mutations) && prob(50)) + if((CLUMSY in user.mutations) && prob(50)) user << "Huh? How does this thing work?" active = 1 icon_state = initial(icon_state) + "_active" diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 5c6da3e797b..720cb321819 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -17,7 +17,7 @@ var/trashtype = null //For disposable cuffs /obj/item/weapon/restraints/handcuffs/attack(mob/living/carbon/C, mob/user) - if(M_CLUMSY in user.mutations && prob(50)) + if(CLUMSY in user.mutations && prob(50)) user << "Uh... how do those things work?!" apply_cuffs(user,user) diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index bce6b1d02d8..78a19479b2c 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -42,7 +42,7 @@ if(user.a_intent != "help") if(user.zone_sel.selecting == "head" || user.zone_sel.selecting == "eyes") - if((M_CLUMSY in user.mutations) && prob(50)) + if((CLUMSY in user.mutations) && prob(50)) M = user return eyestab(M,user) else @@ -103,7 +103,7 @@ return (BRUTELOSS) /obj/item/weapon/kitchen/utensil/knife/attack(target as mob, mob/living/user as mob) - if ((M_CLUMSY in user.mutations) && prob(50)) + if ((CLUMSY in user.mutations) && prob(50)) user << "\red You accidentally cut yourself with the [src]." user.take_organ_damage(20) return @@ -118,7 +118,7 @@ throwforce = 10.0 /obj/item/weapon/kitchen/utensil/knife/attack(target as mob, mob/living/user as mob) - if ((M_CLUMSY in user.mutations) && prob(50)) + if ((CLUMSY in user.mutations) && prob(50)) user << "\red You somehow managed to cut yourself with the [src]." user.take_organ_damage(20) return @@ -216,7 +216,7 @@ attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked") //I think the rollingpin attackby will end up ignoring this anyway. /obj/item/weapon/kitchen/rollingpin/attack(mob/living/M as mob, mob/living/user as mob) - if ((M_CLUMSY in user.mutations) && prob(50)) + if ((CLUMSY in user.mutations) && prob(50)) user << "\red The [src] slips out of your hand and hits your head." user.take_organ_damage(10) user.Paralyse(2) @@ -303,7 +303,7 @@ sleep(rand(2,4)) - if((M_CLUMSY in user.mutations) && prob(50)) //What if he's a clown? + if((CLUMSY in user.mutations) && prob(50)) //What if he's a clown? M << "\red You accidentally slam yourself with the [src]!" M.Weaken(1) user.take_organ_damage(2) diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm index d4efe740192..98d2fcfe85b 100644 --- a/code/game/objects/items/weapons/storage/bible.dm +++ b/code/game/objects/items/weapons/storage/bible.dm @@ -66,7 +66,7 @@ user.take_organ_damage(0,10) return - if ((M_CLUMSY in user.mutations) && prob(50)) + if ((CLUMSY in user.mutations) && prob(50)) user << "\red The [src] slips out of your hand and hits your head." user.take_organ_damage(10) user.Paralyse(20) diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm index 1a2faf6b1a7..ec403929c85 100644 --- a/code/game/objects/items/weapons/storage/briefcase.dm +++ b/code/game/objects/items/weapons/storage/briefcase.dm @@ -19,7 +19,7 @@ /obj/item/weapon/storage/briefcase/attack(mob/living/M as mob, mob/living/user as mob) //..() - if ((M_CLUMSY in user.mutations) && prob(50)) + if ((CLUMSY in user.mutations) && prob(50)) user << "\red The [src] slips out of your hand and hits your head." user.take_organ_damage(10) user.Paralyse(2) diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index 8620b4d2339..66d3d6a9b50 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -179,7 +179,7 @@ //I consider this worthless but it isn't my code so whatever. Remove or uncomment. /*attack(mob/M as mob, mob/living/user as mob) - if ((M_CLUMSY in user.mutations) && prob(50)) + if ((CLUMSY in user.mutations) && prob(50)) user << "\red The [src] slips out of your hand and hits your head." user.take_organ_damage(10) user.Paralyse(2) diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index ae0509b00fa..99cd5b3e97b 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -101,7 +101,7 @@ add_fingerprint(user) /obj/item/weapon/melee/baton/attack(mob/M, mob/living/user) - if(status && (M_CLUMSY in user.mutations) && prob(50)) + if(status && (CLUMSY in user.mutations) && prob(50)) user.visible_message("[user] accidentally hits themself with [src]!", \ "You accidentally hit yourself with [src]!") user.Weaken(stunforce*3) diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index e85df4485bf..2354dcb9832 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -401,9 +401,9 @@ LOOK FOR SURGERY.DM*/ if(!istype(M)) return ..() - //if(M.mutations & M_HUSK) return ..() + //if(M.mutations & HUSK) return ..() - if((M_CLUMSY in user.mutations) && prob(50)) + if((CLUMSY in user.mutations) && prob(50)) M = user return eyestab(M,user) @@ -649,7 +649,7 @@ LOOK FOR SURGERY.DM*/ if(!istype(M)) return ..() - if((M_CLUMSY in user.mutations) && prob(50)) + if((CLUMSY in user.mutations) && prob(50)) M = user return eyestab(M,user) diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index 9cf1cee7846..fa8d29f4b29 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -27,7 +27,7 @@ blade_color = pick("red","blue","green","purple") /obj/item/weapon/melee/energy/sword/attack_self(mob/living/user as mob) - if ((M_CLUMSY in user.mutations) && prob(50)) + if ((CLUMSY in user.mutations) && prob(50)) user << "\red You accidentally cut yourself with [src]." user.take_organ_damage(5,5) active = !active @@ -105,7 +105,7 @@ force = 10 /obj/item/weapon/melee/classic_baton/attack(mob/M as mob, mob/living/user as mob) - if ((M_CLUMSY in user.mutations) && prob(50)) + if ((CLUMSY in user.mutations) && prob(50)) user << "\red You club yourself over the head." user.Weaken(3 * force) if(ishuman(user)) @@ -124,7 +124,7 @@ if (user.a_intent == "harm") if(!..()) return playsound(get_turf(src), "swing_hit", 50, 1, -1) - if (M.stuttering < 8 && (!(M_HULK in M.mutations)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) + if (M.stuttering < 8 && (!(HULK in M.mutations)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) M.stuttering = 8 M.Stun(8) M.Weaken(8) @@ -201,7 +201,7 @@ /obj/item/weapon/melee/telebaton/attack(mob/target as mob, mob/living/user as mob) if(on) add_fingerprint(user) - if((M_CLUMSY in user.mutations) && prob(50)) + if((CLUMSY in user.mutations) && prob(50)) user << "You club yourself over the head." user.Weaken(3 * force) if(ishuman(user)) @@ -295,7 +295,7 @@ return 0 /obj/item/weapon/shield/energy/attack_self(mob/living/user as mob) - if ((M_CLUMSY in user.mutations) && prob(50)) + if ((CLUMSY in user.mutations) && prob(50)) user << "\red You beat yourself in the head with [src]." user.take_organ_damage(5) active = !active diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 8f85c3f0bff..52cbd98e6ff 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -87,7 +87,7 @@ if(!istype(M)) return ..() if(user.zone_sel.selecting != "eyes" && user.zone_sel.selecting != "head") return ..() - if((M_CLUMSY in user.mutations) && prob(50)) + if((CLUMSY in user.mutations) && prob(50)) M = user return eyestab(M,user) diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 417cfdbbca7..f3b9195ca84 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -227,7 +227,7 @@ obj/item/weapon/twohanded/ /obj/item/weapon/twohanded/dualsaber/attack(target as mob, mob/living/user as mob) ..() - if((M_CLUMSY in user.mutations) && (wielded) &&prob(40)) + if((CLUMSY in user.mutations) && (wielded) &&prob(40)) user << "\red You twirl around a bit before losing your balance and impaling yourself on the [src]." user.take_organ_damage(20,25) return diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 998d24f8abc..73e14110f78 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -47,7 +47,7 @@ user << "\red You don't have the dexterity to do this!" return - if ((M_CLUMSY in user.mutations) && prob(50)) + if ((CLUMSY in user.mutations) && prob(50)) user << "\red The rod slips out of your hand and hits your head." user.take_organ_damage(10) user.Paralyse(20) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 11d68d9e6f9..ea8665e5a9a 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -67,7 +67,7 @@ if(shock(user, 70)) return - if(M_HULK in user.mutations) + if(HULK in user.mutations) health -= 5 else health -= 1 diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 676250d27a0..ab4f0bea78b 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -279,7 +279,7 @@ destroy() /obj/structure/table/attack_paw(mob/user) - if(M_HULK in user.mutations) + if(HULK in user.mutations) user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) visible_message("[user] smashes the [src] apart!") destroy() @@ -297,7 +297,7 @@ /obj/structure/table/attack_hand(mob/user) - if(M_HULK in user.mutations) + if(HULK in user.mutations) visible_message("[user] smashes [src] apart!") user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) destroy() @@ -760,14 +760,14 @@ /obj/structure/table/attack_hand(mob/user) - if(M_HULK in user.mutations) + if(HULK in user.mutations) visible_message("[user] smashes [src] apart!") user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) destroy() /obj/structure/rack/attack_paw(mob/user) - if(M_HULK in user.mutations) + if(HULK in user.mutations) user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) visible_message("[user] smashes [src] apart!") destroy() diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index be28a7be0f8..829908025b4 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -153,7 +153,7 @@ var/global/wcColored /obj/structure/window/attack_hand(mob/user as mob) - if(M_HULK in user.mutations) + if(HULK in user.mutations) user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!")) user.visible_message("[user] smashes through [src]!") var/pdiff=performWallPressureCheck(src.loc) diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index ee840bcbe5d..8025554f667 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -242,7 +242,7 @@ /turf/simulated/wall/attack_paw(mob/user as mob) user.changeNext_move(CLICK_CD_MELEE) - if ((M_HULK in user.mutations)) + if ((HULK in user.mutations)) if (prob(40)) usr << text("\blue You smash through the wall.") usr.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) @@ -272,7 +272,7 @@ /turf/simulated/wall/attack_hand(mob/user as mob) user.changeNext_move(CLICK_CD_MELEE) - if (M_HULK in user.mutations) + if (HULK in user.mutations) if (prob(40) || rotting) user << text("\blue You smash through the wall.") user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm index dd9736d3685..da5664959a6 100644 --- a/code/game/turfs/simulated/walls_reinforced.dm +++ b/code/game/turfs/simulated/walls_reinforced.dm @@ -13,7 +13,7 @@ var/d_state = 0 /turf/simulated/wall/r_wall/attack_hand(mob/user as mob) - if (M_HULK in user.mutations) + if (HULK in user.mutations) if (prob(10) || rotting) usr << text("\blue You smash through the wall.") usr.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) diff --git a/code/modules/admin/verbs/honksquad.dm b/code/modules/admin/verbs/honksquad.dm index a56d6cd091f..5583b36435b 100644 --- a/code/modules/admin/verbs/honksquad.dm +++ b/code/modules/admin/verbs/honksquad.dm @@ -119,7 +119,7 @@ var/global/sent_honksquad = 0 equip_to_slot_or_del(new /obj/item/toy/crayon/rainbow(src), slot_in_backpack) equip_to_slot_or_del(new /obj/item/weapon/gun/energy/clown(src), slot_in_backpack) equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/spray/waterflower(src), slot_in_backpack) - src.mutations.Add(M_CLUMSY) + src.mutations.Add(CLUMSY) diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index a7ac697ad8f..507f879cca4 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -19,7 +19,7 @@ if(!armed) if(ishuman(usr)) var/mob/living/carbon/human/user = usr - if(((user.getBrainLoss() >= 60 || (M_CLUMSY in user.mutations)) && prob(50))) + if(((user.getBrainLoss() >= 60 || (CLUMSY in user.mutations)) && prob(50))) user << "Your hand slips, setting off the trigger." pulse(0) update_icon() @@ -69,7 +69,7 @@ if(!armed) user << "You arm [src]." else - if(((user.getBrainLoss() >= 60 || (M_CLUMSY in user.mutations)) && prob(50))) + if(((user.getBrainLoss() >= 60 || (CLUMSY in user.mutations)) && prob(50))) var/which_hand = "l_hand" if(!user.hand) which_hand = "r_hand" @@ -85,7 +85,7 @@ attack_hand(mob/living/user as mob) if(armed) - if(((user.getBrainLoss() >= 60 || M_CLUMSY in user.mutations)) && prob(50)) + if(((user.getBrainLoss() >= 60 || CLUMSY in user.mutations)) && prob(50)) var/which_hand = "l_hand" if(!user.hand) which_hand = "r_hand" diff --git a/code/modules/awaymissions/mission_code/wildwest.dm b/code/modules/awaymissions/mission_code/wildwest.dm index 3a91028f2df..180fbf7a331 100644 --- a/code/modules/awaymissions/mission_code/wildwest.dm +++ b/code/modules/awaymissions/mission_code/wildwest.dm @@ -77,9 +77,9 @@ if("Power") user << "Your wish is granted, but at a terrible cost..." user << "The Wish Granter punishes you for your selfishness, claiming your soul and warping your body to match the darkness in your heart." - user.mutations.Add(M_LASER) - user.mutations.Add(M_RESIST_COLD) - user.mutations.Add(M_XRAY) + user.mutations.Add(LASER) + user.mutations.Add(RESIST_COLD) + user.mutations.Add(XRAY) user.dna.mutantrace = "shadow" user.regenerate_icons() if("Wealth") diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index dfb6b4092d2..f86d222a4a4 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -1464,8 +1464,8 @@ datum/preferences else continue if(disabilities & DISABILITY_FLAG_FAT && character.species.flags & CAN_BE_FAT)//character.species.flags & CAN_BE_FAT) - character.mutations += M_FAT - character.mutations += M_OBESITY + character.mutations += FAT + character.mutations += OBESITY if(disabilities & DISABILITY_FLAG_NEARSIGHTED) character.disabilities|=NEARSIGHTED if(disabilities & DISABILITY_FLAG_EPILEPTIC) diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm index 7e6bb5ea7da..04004b1ac93 100644 --- a/code/modules/mob/living/carbon/alien/alien.dm +++ b/code/modules/mob/living/carbon/alien/alien.dm @@ -125,7 +125,7 @@ /mob/living/carbon/alien/proc/handle_mutations_and_radiation() if(getFireLoss()) - if((M_RESIST_HEAT in mutations) || prob(5)) + if((RESIST_HEAT in mutations) || prob(5)) adjustFireLoss(-1) // Aliens love radiation nom nom nom diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index 721c2a4b3fb..ab33e676ed0 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -250,7 +250,7 @@ if ("harm") var/damage = rand(1, 9) if (prob(90)) - if (M_HULK in M.mutations)//M_HULK SMASH + if (HULK in M.mutations)//HULK SMASH damage += 14 spawn(0) Paralyse(1) diff --git a/code/modules/mob/living/carbon/alien/humanoid/life.dm b/code/modules/mob/living/carbon/alien/humanoid/life.dm index e59f50a5e5c..22f9bec9e0c 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/life.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/life.dm @@ -187,7 +187,7 @@ /mob/living/carbon/alien/humanoid/proc/handle_regular_hud_updates() - if (stat == 2 || (M_XRAY in mutations)) + if (stat == 2 || (XRAY in mutations)) sight |= SEE_TURFS sight |= SEE_MOBS sight |= SEE_OBJS diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm index a918e069bb7..ac66a310d76 100644 --- a/code/modules/mob/living/carbon/alien/larva/larva.dm +++ b/code/modules/mob/living/carbon/alien/larva/larva.dm @@ -36,7 +36,7 @@ now_pushing = 1 if(ismob(AM)) var/mob/tmob = AM - if(istype(tmob, /mob/living/carbon/human) && (M_FAT in tmob.mutations)) + if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations)) if(prob(70)) src << "\red You fail to push [tmob]'s fat ass out of the way." now_pushing = 0 @@ -146,7 +146,7 @@ if(..()) var/damage = rand(1, 9) if (prob(90)) - if (M_HULK in M.mutations) + if (HULK in M.mutations) damage += 5 spawn(0) Paralyse(1) diff --git a/code/modules/mob/living/carbon/alien/larva/life.dm b/code/modules/mob/living/carbon/alien/larva/life.dm index 796f0a7cc00..6930ee09dd9 100644 --- a/code/modules/mob/living/carbon/alien/larva/life.dm +++ b/code/modules/mob/living/carbon/alien/larva/life.dm @@ -135,7 +135,7 @@ /mob/living/carbon/alien/larva/proc/handle_regular_hud_updates() - if (stat == 2 || (M_XRAY in mutations)) + if (stat == 2 || (XRAY in mutations)) sight |= SEE_TURFS sight |= SEE_MOBS sight |= SEE_OBJS diff --git a/code/modules/mob/living/carbon/alien/life.dm b/code/modules/mob/living/carbon/alien/life.dm index e82dda81b61..c102a59ca6c 100644 --- a/code/modules/mob/living/carbon/alien/life.dm +++ b/code/modules/mob/living/carbon/alien/life.dm @@ -101,7 +101,7 @@ breath.toxins -= toxins_used breath.oxygen += toxins_used - if(breath.temperature > (T0C+66) && !(M_RESIST_COLD in mutations)) // Hot air hurts :( + if(breath.temperature > (T0C+66) && !(RESIST_COLD in mutations)) // Hot air hurts :( if(prob(20)) src << "You feel a searing heat in your lungs!" fire_alert = max(fire_alert, 1) diff --git a/code/modules/mob/living/carbon/alien/special/snakeman.dm b/code/modules/mob/living/carbon/alien/special/snakeman.dm index d1d55895d88..7aa7b9d5db0 100644 --- a/code/modules/mob/living/carbon/alien/special/snakeman.dm +++ b/code/modules/mob/living/carbon/alien/special/snakeman.dm @@ -33,7 +33,7 @@ M.client.mob = new/mob/living/carbon/alien/humanoid/special/snakeman(new/obj/effect/snake_egg(src.loc)) visible_message("[src] injects [M] with an egg.") visible_message("The egg absorbs [M]") - M.mutations |= M_NOCLONE + M.mutations |= NOCLONE M.update_body() M.death() else diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm index 65bf8148a56..606959d5de8 100644 --- a/code/modules/mob/living/carbon/brain/life.dm +++ b/code/modules/mob/living/carbon/brain/life.dm @@ -193,7 +193,7 @@ proc/handle_regular_hud_updates() - if (stat == 2 || (M_XRAY in src.mutations)) + if (stat == 2 || (XRAY in src.mutations)) sight |= SEE_TURFS sight |= SEE_MOBS sight |= SEE_OBJS diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index dcfc65efcae..0aba7817abf 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -17,7 +17,7 @@ src.nutrition -= HUNGER_FACTOR/10 if(src.m_intent == "run") src.nutrition -= HUNGER_FACTOR/10 - if((M_FAT in src.mutations) && src.m_intent == "run" && src.bodytemperature <= 360) + if((FAT in src.mutations) && src.m_intent == "run" && src.bodytemperature <= 360) src.bodytemperature += 2 // Moving around increases germ_level faster diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 08fe26ce77f..43ac690597d 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -151,7 +151,7 @@ return /mob/living/carbon/human/proc/ChangeToHusk() - if(M_HUSK in mutations) return + if(HUSK in mutations) return if(f_style) f_style = "Shaved" //we only change the icon_state of the hair datum, so it doesn't mess up their UI/UE @@ -159,7 +159,7 @@ h_style = "Bald" update_hair(0) - mutations.Add(M_HUSK) + mutations.Add(HUSK) status_flags |= DISFIGURED //makes them unknown without fucking up other stuff like admintools update_body(0) update_mutantrace() @@ -167,5 +167,5 @@ /mob/living/carbon/human/proc/Drain() ChangeToHusk() - mutations |= M_NOCLONE + mutations |= NOCLONE return diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 40dd8959564..6da5df8c9c4 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -636,7 +636,7 @@ if("fart") if(world.time-lastFart >= 600) // playsound(src.loc, 'sound/effects/fart.ogg', 50, 1, -3) //Admins still vote no to fun - if(M_TOXIC_FARTS in mutations) + if(TOXIC_FARTS in mutations) message = "[src] unleashes a [pick("horrible","terrible","foul","disgusting","awful")] fart." else message = "[src] [pick("passes wind","farts")]." @@ -644,7 +644,7 @@ var/turf/location = get_turf(src) var/aoe_range=2 // Default - if(M_SUPER_FART in mutations) + if(SUPER_FART in mutations) aoe_range+=3 //Was 5 /* // If we're wearing a suit, don't blast or gas those around us. @@ -656,7 +656,7 @@ wearing_mask=1 */ // Process toxic farts first. - if(M_TOXIC_FARTS in mutations) + if(TOXIC_FARTS in mutations) for(var/mob/M in range(location,aoe_range)) if (M.internal != null && M.wear_mask && (M.wear_mask.flags & MASKINTERNALS)) continue @@ -681,7 +681,7 @@ sleep(10) S.start() */ - if(M_SUPER_FART in mutations) + if(SUPER_FART in mutations) visible_message("\red [name] hunches down and grits their teeth!") if(do_after(usr,30)) visible_message("\red [name] unleashes a [pick("tremendous","gigantic","colossal")] fart!","You hear a [pick("tremendous","gigantic","colossal")] fart.") diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index dfdd8b41195..e5a3413bb2e 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -205,7 +205,7 @@ if(suiciding) msg += "[t_He] appears to have commited suicide... there is no hope of recovery.\n" - if(M_DWARF in mutations) + if(DWARF in mutations) msg += "[t_He] [t_is] a halfling!\n" var/distance = get_dist(usr,src) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 1435949c6a6..b2d3d093792 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -143,8 +143,8 @@ slime.UpdateFeed() return - if(istype(tmob, /mob/living/carbon/human) && (M_FAT in tmob.mutations)) - if(prob(40) && !(M_FAT in src.mutations)) + if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations)) + if(prob(40) && !(FAT in src.mutations)) src << "\red You fail to push [tmob]'s fat ass out of the way." now_pushing = 0 return @@ -590,7 +590,7 @@ //Returns "Unknown" if facially disfigured and real_name if not. Useful for setting name when polyacided or when updating a human's name variable /mob/living/carbon/human/proc/get_face_name() var/datum/organ/external/head/head = get_organ("head") - if( !head || head.disfigured || (head.status & ORGAN_DESTROYED) || !real_name || (M_HUSK in mutations) ) //disfigured. use id-name if possible + if( !head || head.disfigured || (head.status & ORGAN_DESTROYED) || !real_name || (HUSK in mutations) ) //disfigured. use id-name if possible return "Unknown" return real_name diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 2fdf3c42498..6310c3a8175 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -31,7 +31,7 @@ var/datum/organ/external/affecting = get_organ(ran_zone(M.zone_sel.selecting)) var/armor_block = run_armor_check(affecting, "melee") - if(M_HULK in M.mutations) damage += 5 + if(HULK in M.mutations) damage += 5 playsound(loc, "punch", 25, 1, -1) @@ -137,7 +137,7 @@ var/datum/organ/external/affecting = get_organ(ran_zone(M.zone_sel.selecting)) var/armor_block = run_armor_check(affecting, "melee") - if(M_HULK in M.mutations) damage += 5 + if(HULK in M.mutations) damage += 5 playsound(loc, attack.attack_sound, 25, 1, -1) diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 49b6a73143c..029283f3e3b 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -110,15 +110,15 @@ hud_updateflag |= 1 << HEALTH_HUD /mob/living/carbon/human/Stun(amount) - if(M_HULK in mutations) return + if(HULK in mutations) return ..() /mob/living/carbon/human/Weaken(amount) - if(M_HULK in mutations) return + if(HULK in mutations) return ..() /mob/living/carbon/human/Paralyse(amount) - if(M_HULK in mutations) return + if(HULK in mutations) return ..() diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 01bbfe7f5f3..64043e02bc2 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -11,7 +11,7 @@ if(embedded_flag) handle_embedded_objects() //Moving with objects stuck in you can cause bad times. - if((M_RUN in mutations)) return -1 + if((RUN in mutations)) return -1 var/health_deficiency = (100 - health + staminaloss) if(health_deficiency >= 40) @@ -55,12 +55,12 @@ tally += back.slowdown - if(M_FAT in src.mutations) + if(FAT in src.mutations) tally += 1.5 if (bodytemperature < 283.222) tally += (283.222 - bodytemperature) / 10 * 1.75 - if(M_RUN in mutations) + if(RUN in mutations) tally = 0 return (tally+config.human_delay) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 0f32d9d187e..ceeae892199 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -303,7 +303,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc return if(getFireLoss()) - if((M_RESIST_HEAT in mutations) || (prob(1))) + if((RESIST_HEAT in mutations) || (prob(1))) heal_organ_damage(0,1) @@ -389,7 +389,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc proc/breathe() if(reagents.has_reagent("lexorin")) return - if(M_NO_BREATH in mutations) return // No breath mutation means no breathing. + if(NO_BREATH in mutations) return // No breath mutation means no breathing. if(istype(loc, /obj/machinery/atmospherics/unary/cryo_cell)) return if(species && (species.flags & NO_BREATHE)) return @@ -618,7 +618,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc else if(adjusted_pressure >= species.hazard_low_pressure) pressure_alert = -1 else - if( !(M_RESIST_COLD in mutations)) + if( !(RESIST_COLD in mutations)) take_overall_damage(brute=LOW_PRESSURE_DAMAGE, used_weapon = "Low Pressure") pressure_alert = -2 else @@ -720,7 +720,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc var/thermal_protection_flags = get_heat_protection_flags(temperature) var/thermal_protection = 0.0 - if(M_RESIST_HEAT in mutations) + if(RESIST_HEAT in mutations) return 1 if(thermal_protection_flags) if(thermal_protection_flags & HEAD) @@ -777,7 +777,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc proc/get_cold_protection(temperature) - if(M_RESIST_COLD in mutations) + if(RESIST_COLD in mutations) return 1 //Fully protected from the cold. temperature = max(temperature, 2.7) //There is an occasional bug where the temperature is miscalculated in ares with a small amount of gas on them, so this is necessary to ensure that that bug does not affect this calculation. Space's temperature is 2.7K and most suits that are intended to protect against any cold, protect down to 2.0K. @@ -934,12 +934,12 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc else if (light_amount < 2) //heal in the dark heal_overall_damage(1,1) - //The fucking M_FAT mutation is the greatest shit ever. It makes everyone so hot and bothered. + //The fucking FAT mutation is the greatest shit ever. It makes everyone so hot and bothered. if(species.flags & CAN_BE_FAT) - if(M_FAT in mutations) + if(FAT in mutations) if(overeatduration < 100) src << "\blue You feel fit again!" - mutations.Remove(M_FAT) + mutations.Remove(FAT) update_mutantrace(0) update_mutations(0) update_inv_w_uniform(0) @@ -947,7 +947,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc else if(overeatduration > 500) src << "\red You suddenly feel blubbery!" - mutations.Add(M_FAT) + mutations.Add(FAT) update_mutantrace(0) update_mutations(0) update_inv_w_uniform(0) @@ -963,7 +963,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc else if(overeatduration > 1) - if(M_OBESITY in mutations) + if(OBESITY in mutations) overeatduration -= 1 // Those with obesity gene take twice as long to unfat else overeatduration -= 2 @@ -1006,7 +1006,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc silent = 0 else //ALIVE. LIGHTS ARE ON - if(M_REGEN in mutations) + if(REGEN in mutations) if(nutrition) if(prob(10)) var/randumb = rand(1,5) @@ -1017,7 +1017,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc // Sobering multiplier. // Sober block grants quadruple the alcohol metabolism. -// var/sober_str=!(M_SOBER in mutations)?1:4 +// var/sober_str=!(SOBER in mutations)?1:4 updatehealth() //TODO if(!in_stasis) @@ -1298,7 +1298,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS see_in_dark = 8 if(!druggy) see_invisible = SEE_INVISIBLE_LEVEL_TWO - if(M_XRAY in mutations) + if(XRAY in mutations) sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS see_in_dark = 8 if(!druggy) see_invisible = SEE_INVISIBLE_LEVEL_TWO @@ -1509,7 +1509,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc if(!machine.check_eye(src)) reset_view(null) else var/isRemoteObserve = 0 - if((M_REMOTE_VIEW in mutations) && remoteview_target) + if((REMOTE_VIEW in mutations) && remoteview_target) isRemoteObserve = 1 // Is he unconscious or dead? if(remoteview_target.stat!=CONSCIOUS) @@ -1517,7 +1517,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc isRemoteObserve = 0 // Does he have psy resist? - if(M_PSY_RESIST in remoteview_target.mutations) + if(PSY_RESIST in remoteview_target.mutations) src << "\red Your mind is shut out!" isRemoteObserve = 0 diff --git a/code/modules/mob/living/carbon/human/plasmaman/species.dm b/code/modules/mob/living/carbon/human/plasmaman/species.dm index a9646cdd886..edb0a7c8539 100644 --- a/code/modules/mob/living/carbon/human/plasmaman/species.dm +++ b/code/modules/mob/living/carbon/human/plasmaman/species.dm @@ -130,7 +130,7 @@ H.emote(pick("giggle", "laugh")) SA.moles = 0 - if( (abs(310.15 - breath.temperature) > 50) && !(M_RESIST_HEAT in H.mutations)) // Hot air hurts :( + if( (abs(310.15 - breath.temperature) > 50) && !(RESIST_HEAT in H.mutations)) // Hot air hurts :( if(H.status_flags & GODMODE) return 1 //godmode if(breath.temperature < cold_level_1) diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 4cc61b36290..47d551861ef 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -286,7 +286,7 @@ handled = 1 if(message != "") - if((M_HULK in mutations) && health >= 25 && length(message)) + if((HULK in mutations) && health >= 25 && length(message)) message = "[uppertext(message)]!!!" verb = pick("yells","roars","hollers") handled = 1 diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 937c85bce8e..8db3b6d6f59 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -236,9 +236,9 @@ proc/get_damage_icon_part(damage_state, body_part) var/hulk_color_mod = rgb(48,224,40) var/necrosis_color_mod = rgb(10,50,0) - var/husk = (M_HUSK in src.mutations) //100% unnecessary -Agouri //nope, do you really want to iterate through src.mutations repeatedly? -Pete - var/fat = (M_FAT in src.mutations) - var/hulk = (M_HULK in src.mutations) + var/husk = (HUSK in src.mutations) //100% unnecessary -Agouri //nope, do you really want to iterate through src.mutations repeatedly? -Pete + var/fat = (FAT in src.mutations) + var/hulk = (HULK in src.mutations) var/g = (gender == FEMALE ? "f" : "m") var/has_head = 0 @@ -456,7 +456,7 @@ proc/get_damage_icon_part(damage_state, body_part) /mob/living/carbon/human/update_mutations(var/update_icons=1) var/fat - if(M_FAT in mutations) + if(FAT in mutations) fat = "fat" var/image/standing = image("icon" = 'icons/effects/genetics.dmi') @@ -475,26 +475,26 @@ proc/get_damage_icon_part(damage_state, body_part) for(var/mut in mutations) switch(mut) /* - if(M_HULK) + if(HULK) if(fat) standing.underlays += "hulk_[fat]_s" else standing.underlays += "hulk_[g]_s" add_image = 1 - if(M_RESIST_COLD) + if(RESIST_COLD) standing.underlays += "fire[fat]_s" add_image = 1 - if(M_RESIST_HEAT) + if(RESIST_HEAT) standing.underlays += "cold[fat]_s" add_image = 1 if(TK) standing.underlays += "telekinesishead[fat]_s" add_image = 1 */ - if(M_LASER) + if(LASER) standing.overlays += "lasereyes_s" add_image = 1 - if((M_RESIST_COLD in mutations) && (M_RESIST_HEAT in mutations)) + if((RESIST_COLD in mutations) && (RESIST_HEAT in mutations)) standing.underlays -= "cold[fat]_s" standing.underlays -= "fire[fat]_s" standing.underlays += "coldfire[fat]_s" @@ -507,7 +507,7 @@ proc/get_damage_icon_part(damage_state, body_part) /mob/living/carbon/human/proc/update_mutantrace(var/update_icons=1) var/fat - if( M_FAT in mutations ) + if( FAT in mutations ) fat = "fat" // var/g = "m" // if (gender == FEMALE) g = "f" @@ -594,9 +594,9 @@ proc/get_damage_icon_part(damage_state, body_part) if(!t_color) t_color = icon_state var/image/standing = image("icon_state" = "[t_color]_s") - if(M_FAT in mutations) + if(FAT in mutations) if(w_uniform.flags&ONESIZEFITSALL) - standing.icon = 'icons/mob/uniform_fat.dmi' + standing.icon = 'icons/mob/uniforFAT.dmi' else src << "\red You burst out of \the [w_uniform]!" unEquip(w_uniform) @@ -815,7 +815,7 @@ proc/get_damage_icon_part(damage_state, body_part) standing = image("icon" = wear_suit.icon_override, "icon_state" = "[wear_suit.icon_state]") else if(wear_suit.sprite_sheets && wear_suit.sprite_sheets[species.name]) standing = image("icon" = wear_suit.sprite_sheets[species.name], "icon_state" = "[wear_suit.icon_state]") - else if(M_FAT in mutations) + else if(FAT in mutations) if(wear_suit.flags&ONESIZEFITSALL) standing = image("icon" = 'icons/mob/suit_fat.dmi', "icon_state" = "[wear_suit.icon_state]") else diff --git a/code/modules/mob/living/carbon/metroid/metroid.dm b/code/modules/mob/living/carbon/metroid/metroid.dm index 5ed4f781cae..dc6f59289cb 100644 --- a/code/modules/mob/living/carbon/metroid/metroid.dm +++ b/code/modules/mob/living/carbon/metroid/metroid.dm @@ -420,7 +420,7 @@ attacked += 10 if (prob(90)) - if (M_HULK in M.mutations) + if (HULK in M.mutations) damage += 5 if(Victim || Target) Victim = null @@ -958,7 +958,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75 max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE armor = list(melee = 80, bullet = 20, laser = 20, energy = 10, bomb = 0, bio = 0, rad = 0) -/obj/effect/golem_rune +/obj/effect/goleRUNe anchored = 1 desc = "a strange rune used to create golems. It glows when spirits are nearby." name = "rune" diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index 01a5ca76e6d..ab619c4c1a0 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -112,15 +112,15 @@ proc/handle_mutations_and_radiation() if(getFireLoss()) - if((M_RESIST_HEAT in mutations) || prob(50)) + if((RESIST_HEAT in mutations) || prob(50)) switch(getFireLoss()) if(1 to 50) adjustFireLoss(-1) if(51 to 100) adjustFireLoss(-5) - if ((M_HULK in mutations) && health <= 25) - mutations.Remove(M_HULK) + if ((HULK in mutations) && health <= 25) + mutations.Remove(HULK) src << "\red You suddenly feel very weak." Weaken(3) emote("collapse") @@ -421,7 +421,7 @@ if(HAZARD_LOW_PRESSURE to WARNING_LOW_PRESSURE) pressure_alert = -1 else - if( !(M_RESIST_COLD in mutations) ) + if( !(RESIST_COLD in mutations) ) adjustBruteLoss( LOW_PRESSURE_DAMAGE ) pressure_alert = -2 else @@ -561,7 +561,7 @@ proc/handle_regular_hud_updates() - if (stat == 2 || (M_XRAY in mutations)) + if (stat == 2 || (XRAY in mutations)) sight |= SEE_TURFS sight |= SEE_MOBS sight |= SEE_OBJS diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index 290f356cb60..716b2cc856e 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -131,7 +131,7 @@ now_pushing = 1 if(ismob(AM)) var/mob/tmob = AM - if(istype(tmob, /mob/living/carbon/human) && (M_HULK in tmob.mutations)) + if(istype(tmob, /mob/living/carbon/human) && (HULK in tmob.mutations)) if(prob(70)) usr << "\red You fail to push [tmob]'s fat ass out of the way." now_pushing = 0 diff --git a/code/modules/mob/living/carbon/species.dm b/code/modules/mob/living/carbon/species.dm index 02587d04994..1e8f509978e 100644 --- a/code/modules/mob/living/carbon/species.dm +++ b/code/modules/mob/living/carbon/species.dm @@ -208,7 +208,7 @@ spawn(0) H.emote(pick("giggle", "laugh")) SA.moles = 0 - if( (abs(310.15 - breath.temperature) > 50) && !(M_RESIST_HEAT in H.mutations)) // Hot air hurts :( + if( (abs(310.15 - breath.temperature) > 50) && !(RESIST_HEAT in H.mutations)) // Hot air hurts :( if(H.status_flags & GODMODE) return 1 //godmode if(breath.temperature < cold_level_1) if(prob(20)) @@ -546,7 +546,7 @@ brute_mod = 1.25 //greys are fragile - default_genes = list(M_REMOTE_TALK) + default_genes = list(REMOTE_TALK) primitive = /mob/living/carbon/monkey // TODO @@ -555,11 +555,11 @@ /datum/species/grey/handle_dna(var/mob/living/carbon/C, var/remove) if(!remove) C.dna.SetSEState(REMOTETALKBLOCK,1,1) - C.mutations |= M_REMOTE_TALK + C.mutations |= REMOTE_TALK genemutcheck(C,REMOTETALKBLOCK,null,MUTCHK_FORCED) else C.dna.SetSEState(REMOTETALKBLOCK,0,1) - C.mutations -= M_REMOTE_TALK + C.mutations -= REMOTE_TALK genemutcheck(C,REMOTETALKBLOCK,null,MUTCHK_FORCED) C.update_mutations() ..() diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm index 9126dc6bd95..fa15e893f6e 100644 --- a/code/modules/mob/living/damage_procs.dm +++ b/code/modules/mob/living/damage_procs.dm @@ -15,7 +15,7 @@ if(BRUTE) adjustBruteLoss(damage * blocked) if(BURN) - if(M_RESIST_HEAT in mutations) damage = 0 + if(RESIST_HEAT in mutations) damage = 0 adjustFireLoss(damage * blocked) if(TOX) adjustToxLoss(damage * blocked) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 367281f49db..eaa4c170f7d 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -47,9 +47,9 @@ /mob/living/proc/burn_skin(burn_amount) if(istype(src, /mob/living/carbon/human)) //world << "DEBUG: burn_skin(), mutations=[mutations]" - if(M_NO_SHOCK in src.mutations) //shockproof + if(NO_SHOCK in src.mutations) //shockproof return 0 - if (M_RESIST_HEAT in src.mutations) //fireproof + if (RESIST_HEAT in src.mutations) //fireproof return 0 var/mob/living/carbon/human/H = src //make this damage method divide the damage to be done among all the body parts, then burn each body part for that much damage. will have better effect then just randomly picking a body part var/divided_damage = (burn_amount)/(H.organs.len) @@ -61,7 +61,7 @@ H.updatehealth() return 1 else if(istype(src, /mob/living/carbon/monkey)) - if (M_RESIST_HEAT in src.mutations) //fireproof + if (RESIST_HEAT in src.mutations) //fireproof return 0 var/mob/living/carbon/monkey/M = src M.adjustFireLoss(burn_amount) @@ -642,7 +642,7 @@ if(CM.handcuffed && CM.canmove && (CM.last_special <= world.time)) CM.changeNext_move(CLICK_CD_BREAKOUT) CM.last_special = world.time + CLICK_CD_BREAKOUT - if(isalienadult(CM) || (M_HULK in usr.mutations))//Don't want to do a lot of logic gating here. + if(isalienadult(CM) || (HULK in usr.mutations))//Don't want to do a lot of logic gating here. usr << "\red You attempt to break your handcuffs. (This will take around 5 seconds and you need to stand still)" for(var/mob/O in viewers(CM)) O.show_message(text("\red [] is trying to break the handcuffs!", CM), 1) @@ -679,7 +679,7 @@ else if(CM.legcuffed && CM.canmove && (CM.last_special <= world.time)) CM.changeNext_move(CLICK_CD_BREAKOUT) CM.last_special = world.time + CLICK_CD_BREAKOUT - if(isalienadult(CM) || (M_HULK in usr.mutations))//Don't want to do a lot of logic gating here. + if(isalienadult(CM) || (HULK in usr.mutations))//Don't want to do a lot of logic gating here. usr << "\red You attempt to break your legcuffs. (This will take around 5 seconds and you need to stand still)" for(var/mob/O in viewers(CM)) O.show_message(text("\red [] is trying to break the legcuffs!", CM), 1) diff --git a/code/modules/mob/living/silicon/mommi/life.dm b/code/modules/mob/living/silicon/mommi/life.dm index 73e6ee16aa5..eb7aa1dd700 100644 --- a/code/modules/mob/living/silicon/mommi/life.dm +++ b/code/modules/mob/living/silicon/mommi/life.dm @@ -133,7 +133,7 @@ / /mob/living/silicon/robot/mommi/handle_regular_hud_updates() - if (src.stat == 2 || M_XRAY in mutations || src.sight_mode & BORGXRAY) + if (src.stat == 2 || XRAY in mutations || src.sight_mode & BORGXRAY) src.sight |= SEE_TURFS src.sight |= SEE_MOBS src.sight |= SEE_OBJS diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm index e2d6c31e8f6..73ec259f7f7 100644 --- a/code/modules/mob/living/silicon/robot/component.dm +++ b/code/modules/mob/living/silicon/robot/component.dm @@ -183,7 +183,7 @@ var/mode = 1; /obj/item/device/robotanalyzer/attack(mob/living/M as mob, mob/living/user as mob) - if(( (M_CLUMSY in user.mutations) || user.getBrainLoss() >= 60) && prob(50)) + if(( (CLUMSY in user.mutations) || user.getBrainLoss() >= 60) && prob(50)) user << text("\red You try to analyze the floor's vitals!") for(var/mob/O in viewers(M, null)) O.show_message(text("\red [user] has analyzed the floor's vitals!"), 1) diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index 6ecbfbd9dfc..8171b891977 100644 --- a/code/modules/mob/living/silicon/robot/life.dm +++ b/code/modules/mob/living/silicon/robot/life.dm @@ -154,7 +154,7 @@ /mob/living/silicon/robot/proc/handle_regular_hud_updates() - if (src.stat == 2 || M_XRAY in mutations || src.sight_mode & BORGXRAY) + if (src.stat == 2 || XRAY in mutations || src.sight_mode & BORGXRAY) src.sight |= SEE_TURFS src.sight |= SEE_MOBS src.sight |= SEE_OBJS diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index d446be62095..d77f0b3c099 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -566,7 +566,7 @@ now_pushing = 1 if(ismob(AM)) var/mob/tmob = AM - if(istype(tmob, /mob/living/carbon/human) && (M_FAT in tmob.mutations)) + if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations)) if(prob(20)) usr << "\red You fail to push [tmob]'s fat ass out of the way." now_pushing = 0 diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index 0c8f61569b4..ce63e4e9460 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -66,7 +66,7 @@ now_pushing = 1 if(ismob(AM)) var/mob/tmob = AM - if(istype(tmob, /mob/living/carbon/human) && (M_FAT in tmob.mutations)) + if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations)) if(prob(5)) src << "\red You fail to push [tmob]'s fat ass out of the way." now_pushing = 0 diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm index c9dfb0cccef..40972889cf8 100644 --- a/code/modules/mob/living/simple_animal/friendly/corgi.dm +++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm @@ -352,7 +352,7 @@ now_pushing = 1 if(ismob(AM)) var/mob/tmob = AM - if(istype(tmob, /mob/living/carbon/human) && (M_FAT in tmob.mutations)) + if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations)) if(prob(70)) src << "\red You fail to push [tmob]'s fat ass out of the way." now_pushing = 0 diff --git a/code/modules/mob/living/simple_animal/friendly/slime.dm b/code/modules/mob/living/simple_animal/friendly/slime.dm index ddddc43132a..df1fc75659d 100644 --- a/code/modules/mob/living/simple_animal/friendly/slime.dm +++ b/code/modules/mob/living/simple_animal/friendly/slime.dm @@ -23,7 +23,7 @@ now_pushing = 1 if(ismob(AM)) var/mob/tmob = AM - if(istype(tmob, /mob/living/carbon/human) && (M_FAT in tmob.mutations)) + if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations)) if(prob(70)) src << "\red You fail to push [tmob]'s fat ass out of the way." now_pushing = 0 diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 81b4877f09d..f2f099f578a 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -331,7 +331,7 @@ var/list/slot_equipment_priority = list( \ if(slot_w_uniform) if( !(slot_flags & SLOT_ICLOTHING) ) return 0 - if((M_FAT in H.mutations) && !(flags & ONESIZEFITSALL)) + if((FAT in H.mutations) && !(flags & ONESIZEFITSALL)) return 0 if(H.w_uniform) if(!(H.w_uniform.flags & NODROP)) diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index dcb5f31ff0f..01f32df8e14 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -189,7 +189,7 @@ s_click(hud) return if(M == assailant && state >= GRAB_AGGRESSIVE) - if( (ishuman(user) && (M_FAT in user.mutations) && iscarbon(affecting) ) || ( isalien(user) && iscarbon(affecting) ) || ( istype(user,/mob/living/carbon/human/kidan) && istype(affecting,/mob/living/carbon/monkey/diona) ) ) + if( (ishuman(user) && (FAT in user.mutations) && iscarbon(affecting) ) || ( isalien(user) && iscarbon(affecting) ) || ( istype(user,/mob/living/carbon/human/kidan) && istype(affecting,/mob/living/carbon/monkey/diona) ) ) var/mob/living/carbon/attacker = user user.visible_message("[user] is attempting to devour [affecting]!") if(istype(user, /mob/living/carbon/alien/humanoid/hunter)) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 4810c0b10f7..a68d5bc80f9 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -495,7 +495,7 @@ new_character.disabilities |= NEARSIGHTED if(client.prefs.disabilities & DISABILITY_FLAG_FAT) - new_character.mutations += M_FAT + new_character.mutations += FAT new_character.overeatduration = 600 // Max overeat if(client.prefs.disabilities & DISABILITY_FLAG_EPILEPTIC) diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index d3a5dd1662a..3754199d222 100644 --- a/code/modules/mob/new_player/preferences_setup.dm +++ b/code/modules/mob/new_player/preferences_setup.dm @@ -261,7 +261,7 @@ datum/preferences var/icon/clothes_s = null var/uniform_dmi='icons/mob/uniform.dmi' if(disabilities&DISABILITY_FLAG_FAT) - uniform_dmi='icons/mob/uniform_fat.dmi' + uniform_dmi='icons/mob/uniforFAT.dmi' if(job_support_low & CIVILIAN)//This gives the preview icon clothes depending on which job(if any) is set to 'high' clothes_s = new /icon(uniform_dmi, "grey_s") clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm index 6b37eb96948..096c5f0f9c2 100644 --- a/code/modules/nano/nanoui.dm +++ b/code/modules/nano/nanoui.dm @@ -252,7 +252,7 @@ nanoui is used to open and update nano browser uis . = shared_living_nano_interaction(src_object) if(. == STATUS_INTERACTIVE && be_close) . = shared_living_nano_distance(src_object) - if(. == STATUS_UPDATE && (M_TK in mutations)) // If we have telekinesis and remain close enough, allow interaction. + if(. == STATUS_UPDATE && (TK in mutations)) // If we have telekinesis and remain close enough, allow interaction. return STATUS_INTERACTIVE /** diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index e1727a18ad7..da409857a2e 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -73,7 +73,7 @@ set category = "Object" set src in usr - if((M_CLUMSY in usr.mutations) && prob(50)) + if((CLUMSY in usr.mutations) && prob(50)) usr << "You cut yourself on the paper." return var/n_name = sanitize(copytext(input(usr, "What would you like to label the paper?", "Paper Labelling", name) as text, 1, MAX_MESSAGE_LEN)) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 5aef5c541af..4d40d213faf 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -399,7 +399,7 @@ continue M.show_message("[user.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2) if(on && (W.flags & CONDUCT)) - //if(!user.mutations & M_RESIST_COLD) + //if(!user.mutations & RESIST_COLD) if (prob(12)) electrocute_mob(user, get_area(src), src, 0.3) broken() @@ -435,7 +435,7 @@ var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(3, 1, src) s.start() - //if(!user.mutations & M_RESIST_COLD) + //if(!user.mutations & RESIST_COLD) if (prob(75)) electrocute_mob(user, get_area(src), src, rand(0.7,1.0)) @@ -511,9 +511,9 @@ else prot = 1 - if(prot > 0 || (M_RESIST_HEAT in user.mutations)) + if(prot > 0 || (RESIST_HEAT in user.mutations)) user << "You remove the light [fitting]" - else if(M_TK in user.mutations) + else if(TK in user.mutations) user << "You telekinetically remove the light [fitting]." else user << "You try to remove the light [fitting], but you burn your hand on it!" diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 566cc667745..debe1326e35 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -78,11 +78,11 @@ return 1 /obj/item/weapon/gun/proc/Fire(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, params, reflex = 0)//TODO: go over this - //Exclude lasertag guns from the M_CLUMSY check. + //Exclude lasertag guns from the CLUMSY check. if(clumsy_check) if(istype(user, /mob/living)) var/mob/living/M = user - if ((M_CLUMSY in M.mutations) && prob(50)) + if ((CLUMSY in M.mutations) && prob(50)) M << "[src] blows up in your face." M.take_organ_damage(0,20) M.drop_item() @@ -94,7 +94,7 @@ return if(istype(user, /mob/living)) var/mob/living/M = user - if (M_HULK in M.mutations) + if (HULK in M.mutations) M << "\red Your meaty finger is much too large for the trigger guard!" return if(ishuman(user)) diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index fd8d1334e30..5be11e3dd9d 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -398,7 +398,7 @@ datum on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - if (M_FAT in M.mutations) + if (FAT in M.mutations) M.gib() ..() return @@ -3298,7 +3298,7 @@ datum on_mob_life(var/mob/living/M as mob, var/alien) // Sobering multiplier. // Sober block makes it more difficult to get drunk - var/sober_str=!(M_SOBER in M.mutations)?1:2 + var/sober_str=!(SOBER in M.mutations)?1:2 M:nutrition += nutriment_factor holder.remove_reagent(src.id, FOOD_METABOLISM) if(!src.data) data = 1 diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 0cc8356150c..d9f3fed0be6 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -1469,7 +1469,7 @@ datum required_other = 1 on_reaction(var/datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") - var/obj/effect/golem_rune/Z = new /obj/effect/golem_rune + var/obj/effect/goleRUNe/Z = new /obj/effect/goleRUNe Z.loc = get_turf(holder.my_atom) Z.announce_to_ghosts() //Bluespace diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 7ef798f86e5..79063ea4205 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -60,7 +60,7 @@ return if (user.a_intent == "harm" && ismob(target)) - if((M_CLUMSY in user.mutations) && prob(50)) + if((CLUMSY in user.mutations) && prob(50)) target = user syringestab(target, user) return @@ -86,7 +86,7 @@ if(!T.dna) usr << "You are unable to locate any blood. (To be specific, your target seems to be missing their DNA datum)" return - if(M_NOCLONE in T.mutations) //target done been et, no more blood in him + if(NOCLONE in T.mutations) //target done been et, no more blood in him user << "\red You are unable to locate any blood." return diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 9de451fd848..c6bec8f69f4 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -530,7 +530,7 @@ AM.loc = src if(istype(AM, /mob/living/carbon/human)) var/mob/living/carbon/human/H = AM - if(M_FAT in H.mutations) // is a human and fat? + if(FAT in H.mutations) // is a human and fat? has_fat_guy = 1 // set flag on holder if(istype(AM, /obj/structure/bigDelivery) && !hasmob) var/obj/structure/bigDelivery/T = AM diff --git a/code/modules/virus2/items_devices.dm b/code/modules/virus2/items_devices.dm index f0d9a988c3b..086e87c6955 100644 --- a/code/modules/virus2/items_devices.dm +++ b/code/modules/virus2/items_devices.dm @@ -24,7 +24,7 @@ report("Scan Complete: No antibodies detected.", user) return - if (M_CLUMSY in user.mutations && prob(50)) + if (CLUMSY in user.mutations && prob(50)) // I was tempted to be really evil and rot13 the output. report("Antibodies detected: [reverse_text(antigens2string(C.antibodies))]", user) else diff --git a/code/setup.dm b/code/setup.dm index a262ad31c0f..fccb9aee1b4 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -341,18 +341,18 @@ var/MAX_EX_FLASH_RANGE = 14 /////////////////////////////////////// // Generic mutations: -#define M_TK 1 -#define M_RESIST_COLD 2 -#define M_XRAY 3 -#define M_HULK 4 -#define M_CLUMSY 5 -#define M_FAT 6 -#define M_HUSK 7 -#define M_NOCLONE 8 +#define TK 1 +#define RESIST_COLD 2 +#define XRAY 3 +#define HULK 4 +#define CLUMSY 5 +#define FAT 6 +#define HUSK 7 +#define NOCLONE 8 // Extra powers: -#define M_LASER 9 // harm intent - click anywhere to shoot lasers from eyes +#define LASER 9 // harm intent - click anywhere to shoot lasers from eyes //#define HEAL 10 // (Not implemented) healing people with hands //#define SHADOW 11 // (Not implemented) shadow teleportation (create in/out portals anywhere) (25%) //#define SCREAM 12 // (Not implemented) supersonic screaming (25%) @@ -384,31 +384,31 @@ var/MAX_EX_FLASH_RANGE = 14 #define PLANT 30 // Other Mutations: -#define M_NO_BREATH 100 // no need to breathe -#define M_REMOTE_VIEW 101 // remote viewing -#define M_REGEN 102 // health regen -#define M_RUN 103 // no slowdown -#define M_REMOTE_TALK 104 // remote talking -#define M_MORPH 105 // changing appearance -#define M_RESIST_HEAT 106 // heat resistance -#define M_HALLUCINATE 107 // hallucinations -#define M_FINGERPRINTS 108 // no fingerprints -#define M_NO_SHOCK 109 // insulated hands -#define M_DWARF 110 // table climbing +#define NO_BREATH 100 // no need to breathe +#define REMOTE_VIEW 101 // remote viewing +#define REGEN 102 // health regen +#define RUN 103 // no slowdown +#define REMOTE_TALK 104 // remote talking +#define MORPH 105 // changing appearance +#define RESIST_HEAT 106 // heat resistance +#define HALLUCINATE 107 // hallucinations +#define FINGERPRINTS 108 // no fingerprints +#define NO_SHOCK 109 // insulated hands +#define DWARF 110 // table climbing // Goon muts -#define M_OBESITY 200 // Decreased metabolism -#define M_TOXIC_FARTS 201 // Duh -#define M_STRONG 202 // (Nothing) -#define M_SOBER 203 // Increased alcohol metabolism -#define M_PSY_RESIST 204 // Block remoteview -#define M_SUPER_FART 205 // Duh -#define M_EMPATH 206 //Read minds +#define OBESITY 200 // Decreased metabolism +#define TOXIC_FARTS 201 // Duh +#define STRONG 202 // (Nothing) +#define SOBER 203 // Increased alcohol metabolism +#define PSY_RESIST 204 // Block remoteview +#define SUPER_FART 205 // Duh +#define EMPATH 206 //Read minds // /vg/ muts -#define M_LOUD 208 // CAUSES INTENSE YELLING -#define M_WHISPER 209 // causes quiet whispering -#define M_DIZZY 210 // Trippy. +#define LOUD 208 // CAUSES INTENSE YELLING +#define WHISPER 209 // causes quiet whispering +#define DIZZY 210 // Trippy. //disabilities #define NEARSIGHTED 1