From 678238a0a1458e254887715bc99a1a5f2f226361 Mon Sep 17 00:00:00 2001 From: uporotiy Date: Sat, 7 May 2011 18:29:23 +0000 Subject: [PATCH] Changed all the magic numbers for mutations to PORTALS, COLD_RESISTANCE, XRAY, HULK, CLOWN, FAT and HUSK constants. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1545 316c924e-a436-60f5-8080-3fe189b3f50e --- code/WorkInProgress/recycling/disposal.dm | 2 +- code/defines/procs/gamehelpers.dm | 2 +- code/game/dna.dm | 10 +++--- .../gamemodes/changeling/changeling_powers.dm | 4 +-- code/game/gamemodes/game_mode.dm | 2 +- code/game/gamemodes/wizard/spells.dm | 12 +++---- code/game/gamemodes/wizard/wizard.dm | 2 +- code/game/jobs/jobprocs.dm | 2 +- code/game/machinery/OpTable.dm | 4 +-- code/game/machinery/bots/ed209bot.dm | 6 ++-- code/game/machinery/bots/secbot.dm | 6 ++-- code/game/mecha/mecha.dm | 2 +- code/game/objects/alien/resin.dm | 4 +-- code/game/objects/devices/flash.dm | 6 ++-- code/game/objects/devices/flashlight.dm | 4 +-- code/game/objects/devices/scanners.dm | 2 +- code/game/objects/effect_system.dm | 2 +- code/game/objects/glowshroom.dm | 6 ++-- code/game/objects/grille.dm | 4 +-- code/game/objects/items.dm | 2 +- code/game/objects/items/item.dm | 8 ++--- code/game/objects/items/weapons/grenades.dm | 20 +++++------ code/game/objects/items/weapons/guns_ammo.dm | 34 +++++++++---------- code/game/objects/items/weapons/kitchen.dm | 12 +++---- .../game/objects/items/weapons/papers_bins.dm | 8 ++--- .../objects/items/weapons/surgery_tools.dm | 6 ++-- .../objects/items/weapons/swords_axes_etc.dm | 32 ++++++++--------- code/game/objects/items/weapons/tools.dm | 2 +- code/game/objects/livestock.dm | 2 +- code/game/objects/new_year.dm | 10 +++--- code/game/objects/secstorage/sbriefcase.dm | 2 +- code/game/objects/storage/bible.dm | 4 +-- code/game/objects/storage/briefcase.dm | 6 ++-- code/game/objects/tables_racks.dm | 4 +-- code/game/objects/weapons.dm | 6 ++-- code/game/objects/window.dm | 4 +-- code/game/turf.dm | 4 +-- .../carbon/alien/humanoid/caste/hunter.dm | 2 +- .../carbon/alien/humanoid/caste/sentinel.dm | 2 +- .../living/carbon/alien/humanoid/humanoid.dm | 2 +- .../living/carbon/alien/humanoid/life_new.dm | 20 +++++------ .../mob/living/carbon/alien/humanoid/queen.dm | 2 +- .../mob/living/carbon/alien/larva/larva.dm | 4 +-- .../mob/living/carbon/alien/larva/life.dm | 12 +++---- code/modules/mob/living/carbon/brain/life.dm | 2 +- code/modules/mob/living/carbon/carbon.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 32 ++++++++--------- code/modules/mob/living/carbon/human/life.dm | 20 +++++------ code/modules/mob/living/carbon/monkey/life.dm | 8 ++--- .../mob/living/carbon/monkey/monkey.dm | 4 +-- code/modules/mob/living/living.dm | 4 +-- .../mob/living/silicon/hivebot/hivebot.dm | 2 +- .../mob/living/silicon/hivebot/life.dm | 2 +- code/modules/mob/living/silicon/robot/life.dm | 2 +- .../modules/mob/living/silicon/robot/robot.dm | 2 +- code/modules/mob/mob.dm | 4 +-- code/modules/power/lighting.dm | 6 ++-- code/setup.dm | 9 +++++ maps/tgstation.2.0.7.dmm | 2 +- 59 files changed, 201 insertions(+), 192 deletions(-) diff --git a/code/WorkInProgress/recycling/disposal.dm b/code/WorkInProgress/recycling/disposal.dm index ddf7be65fd3..ed2f2de4533 100644 --- a/code/WorkInProgress/recycling/disposal.dm +++ b/code/WorkInProgress/recycling/disposal.dm @@ -459,7 +459,7 @@ AM.loc = src if(istype(AM, /mob/living/carbon/human)) var/mob/living/carbon/human/H = AM - if(H.mutations & 32) // is a human and fat? + if(H.mutations & FAT) // is a human and fat? has_fat_guy = 1 // set flag on holder if(istype(AM, /obj/bigDelivery)) var/obj/bigDelivery/T = AM diff --git a/code/defines/procs/gamehelpers.dm b/code/defines/procs/gamehelpers.dm index 5695a6f4706..a1399e103d7 100644 --- a/code/defines/procs/gamehelpers.dm +++ b/code/defines/procs/gamehelpers.dm @@ -29,7 +29,7 @@ return 1 else if (istype(user, /mob/living/carbon)) - if (user:mutations & 1 && get_dist(source, user) <= 7) + if (user:mutations & PORTALS && get_dist(source, user) <= 7) var/X = source:x var/Y = source:y var/Z = source:z diff --git a/code/game/dna.dm b/code/game/dna.dm index bfa6967ffbf..2b79bb0f9ef 100644 --- a/code/game/dna.dm +++ b/code/game/dna.dm @@ -286,7 +286,7 @@ if (isblockon(getblock(M.dna.struc_enzymes, HULKBLOCK,3),2)) if(inj || prob(15)) M << "\blue Your muscles hurt." - M.mutations |= 8 + M.mutations |= HULK if (isblockon(getblock(M.dna.struc_enzymes, 3,3),3)) M.disabilities |= 2 M << "\red You get a headache." @@ -304,7 +304,7 @@ M << "\red You start coughing." if (isblockon(getblock(M.dna.struc_enzymes, CLUMSYBLOCK,3),6)) M << "\red You feel lightheaded." - M.mutations |= 16 + M.mutations |= CLOWN if (isblockon(getblock(M.dna.struc_enzymes, 7,3),7)) M.disabilities |= 8 M << "\red You twitch." @@ -314,21 +314,21 @@ M.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS) M.see_in_dark = 8 M.see_invisible = 2 - M.mutations |= 4 + M.mutations |= XRAY if (isblockon(getblock(M.dna.struc_enzymes, 9,3),9)) M.disabilities |= 16 M << "\red You feel nervous." if (isblockon(getblock(M.dna.struc_enzymes, FIREBLOCK,3),10)) if(inj || prob(30)) M << "\blue Your body feels warm." - M.mutations |= 2 + M.mutations |= COLD_RESISTANCE if (isblockon(getblock(M.dna.struc_enzymes, BLINDBLOCK,3),11)) M.sdisabilities |= 1 M << "\red You cant seem to see anything." if (isblockon(getblock(M.dna.struc_enzymes, TELEBLOCK,3),12)) if(inj || prob(15)) M << "\blue You feel smarter." - M.mutations |= 1 + M.mutations |= PORTALS if (isblockon(getblock(M.dna.struc_enzymes, DEAFBLOCK,3),13)) M.sdisabilities |= 4 M.ear_deaf = 1 diff --git a/code/game/gamemodes/changeling/changeling_powers.dm b/code/game/gamemodes/changeling/changeling_powers.dm index 4f38323b13b..03250411aff 100644 --- a/code/game/gamemodes/changeling/changeling_powers.dm +++ b/code/game/gamemodes/changeling/changeling_powers.dm @@ -104,7 +104,7 @@ T.death(0) T.real_name = "Unknown" - T.mutations |= 64 + T.mutations |= HUSK T.update_body() return @@ -524,7 +524,7 @@ usr << "\red We don't have enough stored chemicals to do that!" return - if(T.stat != 2 || (T.mutations & 64) || (!ishuman(T) && !ismonkey(T))) + if(T.stat != 2 || (T.mutations & HUSK) || (!ishuman(T) && !ismonkey(T))) usr << "\red We can't transform that target!" return diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index fe2792f9fb4..9f371d0a4d1 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -62,7 +62,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 &= ~16 + traitor_mob.mutations &= ~CLOWN // generate list of radio freqs var/freq = 1441 var/list/freqlist = list() diff --git a/code/game/gamemodes/wizard/spells.dm b/code/game/gamemodes/wizard/spells.dm index 3162f6b8c6f..1edf677c35e 100644 --- a/code/game/gamemodes/wizard/spells.dm +++ b/code/game/gamemodes/wizard/spells.dm @@ -642,13 +642,13 @@ usr.spellvoice() usr << text("\blue You feel strong! Your mind expands!") - if (!(usr.mutations & 8)) - usr.mutations |= 8 - if (!(usr.mutations & 1)) - usr.mutations |= 1 + if (!(usr.mutations & HULK)) + usr.mutations |= HULK + if (!(usr.mutations & PORTALS)) + usr.mutations |= PORTALS spawn (300) - if (usr.mutations & 1) usr.mutations &= ~1 - if (usr.mutations & 8) usr.mutations &= ~8 + if (usr.mutations & PORTALS) usr.mutations &= ~PORTALS + if (usr.mutations & HULK) usr.mutations &= ~HULK return //BODY SWAP /N diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index 202e9fa2e0f..a2ea312857d 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -717,7 +717,7 @@ Made a proc here so it's not repeated several times.*/ // if (wizard_mob.mind.assigned_role == "Clown") // wizard_mob << "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself." -// wizard_mob.mutations &= ~16 No more clowns as wizarrrddsss +// wizard_mob.mutations &= ~CLOWN No more clowns as wizarrrddsss /*Creates random numbers/codes for the uplink. var/freq = 1441 diff --git a/code/game/jobs/jobprocs.dm b/code/game/jobs/jobprocs.dm index 40111e2f056..dd1e63767c0 100644 --- a/code/game/jobs/jobprocs.dm +++ b/code/game/jobs/jobprocs.dm @@ -341,7 +341,7 @@ src.equip_if_possible(new /obj/item/weapon/stamp/clown(src), slot_in_backpack) src.equip_if_possible(new /obj/item/toy/crayon/rainbow(src), slot_in_backpack) src.equip_if_possible(new /obj/item/toy/crayonbox(src), slot_in_backpack) - src.mutations |= 16 + src.mutations |= CLOWN if ("Mime") src.equip_if_possible(new /obj/item/weapon/storage/backpack(src), slot_back) diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm index 232736ce7d7..e2eebf61fb7 100644 --- a/code/game/machinery/OpTable.dm +++ b/code/game/machinery/OpTable.dm @@ -34,7 +34,7 @@ return /obj/machinery/optable/attack_paw(mob/user as mob) - if ((usr.mutations & 8)) + if ((usr.mutations & HULK)) usr << text("\blue You destroy the operating table.") for(var/mob/O in oviewers()) if ((O.client && !( O.blinded ))) @@ -51,7 +51,7 @@ return /obj/machinery/optable/attack_hand(mob/user as mob) - if ((usr.mutations & 8)) + if ((usr.mutations & HULK)) usr << text("\blue You destroy the table.") for(var/mob/O in oviewers()) if ((O.client && !( O.blinded ))) diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm index 87f47f14286..244aaecccd1 100644 --- a/code/game/machinery/bots/ed209bot.dm +++ b/code/game/machinery/bots/ed209bot.dm @@ -241,11 +241,11 @@ Auto Patrol: []"}, var/mob/living/carbon/M = src.target var/maxstuns = 4 if (istype(M, /mob/living/carbon/human)) - if (M.weakened < 10 && (!(M.mutations & 8)) /*&& (!istype(M:wear_suit, /obj/item/clothing/suit/judgerobe))*/) + if (M.weakened < 10 && (!(M.mutations & HULK)) /*&& (!istype(M:wear_suit, /obj/item/clothing/suit/judgerobe))*/) M.weakened = 10 - if (M.stuttering < 10 && (!(M.mutations & 8)) /*&& (!istype(M:wear_suit, /obj/item/clothing/suit/judgerobe))*/) + if (M.stuttering < 10 && (!(M.mutations & HULK)) /*&& (!istype(M:wear_suit, /obj/item/clothing/suit/judgerobe))*/) M.stuttering = 10 - if (M.stunned < 10 && (!(M.mutations & 8)) /*&& (!istype(M:wear_suit, /obj/item/clothing/suit/judgerobe))*/) + if (M.stunned < 10 && (!(M.mutations & HULK)) /*&& (!istype(M:wear_suit, /obj/item/clothing/suit/judgerobe))*/) M.stunned = 10 else M.weakened = 10 diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm index 082d0bacd6c..791e4425d2f 100644 --- a/code/game/machinery/bots/secbot.dm +++ b/code/game/machinery/bots/secbot.dm @@ -224,11 +224,11 @@ Auto Patrol: []"}, var/mob/living/carbon/M = src.target var/maxstuns = 4 if (istype(M, /mob/living/carbon/human)) - if (M.weakened < 10 && (!(M.mutations & 8)) /*&& (!istype(M:wear_suit, /obj/item/clothing/suit/judgerobe))*/) + if (M.weakened < 10 && (!(M.mutations & HULK)) /*&& (!istype(M:wear_suit, /obj/item/clothing/suit/judgerobe))*/) M.weakened = 10 - if (M.stuttering < 10 && (!(M.mutations & 8)) /*&& (!istype(M:wear_suit, /obj/item/clothing/suit/judgerobe))*/) + if (M.stuttering < 10 && (!(M.mutations & HULK)) /*&& (!istype(M:wear_suit, /obj/item/clothing/suit/judgerobe))*/) M.stuttering = 10 - if (M.stunned < 10 && (!(M.mutations & 8)) /*&& (!istype(M:wear_suit, /obj/item/clothing/suit/judgerobe))*/) + if (M.stunned < 10 && (!(M.mutations & HULK)) /*&& (!istype(M:wear_suit, /obj/item/clothing/suit/judgerobe))*/) M.stunned = 10 else M.weakened = 10 diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index e37d89e359e..67bb0ac3e8e 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -312,7 +312,7 @@ call(/obj/item/clothing/gloves/space_ninja/proc/drain)("MECHA",src,user:wear_suit,user:gloves) return - if (user.mutations & 8 && !prob(src.deflect_chance)) + if (user.mutations & HULK && !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/alien/resin.dm b/code/game/objects/alien/resin.dm index 46db6cbd9e7..c04fb772118 100644 --- a/code/game/objects/alien/resin.dm +++ b/code/game/objects/alien/resin.dm @@ -93,7 +93,7 @@ return /obj/alien/resin/attack_hand() - if ((usr.mutations & 8)) + if ((usr.mutations & HULK)) usr << text("\blue You easily destroy the resin wall.") for(var/mob/O in oviewers()) if ((O.client && !( O.blinded ))) @@ -103,7 +103,7 @@ return /obj/alien/resin/attack_paw() - if ((usr.mutations & 8)) + if ((usr.mutations & HULK)) usr << text("\blue You easily destroy the resin wall.") for(var/mob/O in oviewers()) if ((O.client && !( O.blinded ))) diff --git a/code/game/objects/devices/flash.dm b/code/game/objects/devices/flash.dm index aace3d5359c..3ef2a6f6efc 100644 --- a/code/game/objects/devices/flash.dm +++ b/code/game/objects/devices/flash.dm @@ -1,6 +1,6 @@ /obj/item/device/flash/attack(mob/living/carbon/M as mob, mob/user as mob) - if ((usr.mutations & 16) && prob(50)) + if ((usr.mutations & CLOWN) && prob(50)) usr << "\red The Flash slips out of your hand." usr.drop_item() return @@ -34,7 +34,7 @@ return if (!( safety ) && status == 1) playsound(src.loc, 'flash.ogg', 100, 1) - if(!(M.mutations & 8)) M.weakened = 10 + if(!(M.mutations & HULK)) M.weakened = 10 if (prob(10)) status = 0 user << "\red The bulb has burnt out!" @@ -68,7 +68,7 @@ /obj/item/device/flash/attack_self(mob/living/carbon/user as mob, flag = 0, emp = 0) if (emp) - else if ((usr.mutations & 16) && prob(50)) + else if ((usr.mutations & CLOWN) && prob(50)) usr << "\red The Flash slips out of your hand." usr.drop_item() return diff --git a/code/game/objects/devices/flashlight.dm b/code/game/objects/devices/flashlight.dm index 96d73189588..1b22dac5926 100644 --- a/code/game/objects/devices/flashlight.dm +++ b/code/game/objects/devices/flashlight.dm @@ -16,7 +16,7 @@ /obj/item/device/flashlight/attack(mob/M as mob, mob/user as mob) src.add_fingerprint(user) if(src.on && user.zone_sel.selecting == "eyes") - if ((user.mutations & 16 || user.brainloss >= 60) && prob(50))//too dumb to use flashlight properly + if ((user.mutations & CLOWN || user.brainloss >= 60) && prob(50))//too dumb to use flashlight properly return ..()//just hit them in the head /*user << "\blue You bounce the light spot up and down and drool." for(var/mob/O in viewers(M, null)) @@ -41,7 +41,7 @@ if(M.stat > 1 || M.sdisabilities & 1)//mob is dead or fully blind if(M!=user) user.show_message(text("\red [] pupils does not react to the light!", M),1) - else if(M.mutations&4)//mob has X-RAY vision + else if(M.mutations & XRAY)//mob has X-RAY vision if(M!=user) user.show_message(text("\red [] pupils give an eerie glow!", M),1) else //nothing wrong diff --git a/code/game/objects/devices/scanners.dm b/code/game/objects/devices/scanners.dm index dad59a85239..7492feded41 100644 --- a/code/game/objects/devices/scanners.dm +++ b/code/game/objects/devices/scanners.dm @@ -145,7 +145,7 @@ MASS SPECTROMETER return /obj/item/device/healthanalyzer/attack(mob/M as mob, mob/user as mob) - if ((user.mutations & 16 || user.brainloss >= 60) && prob(50)) + if ((user.mutations & CLOWN || user.brainloss >= 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/effect_system.dm b/code/game/objects/effect_system.dm index 8024254e2d1..f4d8dd93418 100644 --- a/code/game/objects/effect_system.dm +++ b/code/game/objects/effect_system.dm @@ -888,7 +888,7 @@ steam.start() -- spawns the effect return attack_hand(var/mob/user) - if (user.mutations & 8 || (prob(75 - metal*25))) + if (user.mutations & HULK || (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/glowshroom.dm b/code/game/objects/glowshroom.dm index 3c36e80b38c..e2b49328bb4 100644 --- a/code/game/objects/glowshroom.dm +++ b/code/game/objects/glowshroom.dm @@ -112,9 +112,9 @@ var/list/dirList = list() - for(var/i=0,i<=4,i++) - if(direction & 2 ** i) - dirList += 2 ** i + for(var/i=0,i<=4,i <<= 1) + if(direction & i) + dirList += i if(dirList.len) var/newDir = pick(dirList) diff --git a/code/game/objects/grille.dm b/code/game/objects/grille.dm index 59a9b2e0ffc..e8827219efc 100644 --- a/code/game/objects/grille.dm +++ b/code/game/objects/grille.dm @@ -26,7 +26,7 @@ return /obj/grille/attack_hand(var/obj/M) - if ((usr.mutations & 8)) + if ((usr.mutations & HULK)) usr << text("\blue You kick the grille.") for(var/mob/O in oviewers()) if ((O.client && !( O.blinded ))) @@ -44,7 +44,7 @@ healthcheck() /obj/grille/attack_paw(var/obj/M) - if ((usr.mutations & 8)) + if ((usr.mutations & HULK)) usr << text("\blue You kick the grille.") for(var/mob/O in oviewers()) if ((O.client && !( O.blinded ))) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index f1bf8072dad..99f9e0da95a 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -15,7 +15,7 @@ /obj/item/weapon/handcuffs/attack(mob/M as mob, mob/user as mob) - if ((usr.mutations & 16) && prob(50)) + if ((usr.mutations & CLOWN) && prob(50)) usr << "\red Uh ... how do those things work?!" if (istype(M, /mob/living/carbon/human)) var/obj/equip_e/human/O = new /obj/equip_e/human( ) diff --git a/code/game/objects/items/item.dm b/code/game/objects/items/item.dm index c88d16fe96a..81d4cb8bc3f 100644 --- a/code/game/objects/items/item.dm +++ b/code/game/objects/items/item.dm @@ -88,7 +88,7 @@ if(5.0) t = "huge" else - if ((usr.mutations & 16) && prob(50)) t = "funny-looking" + if ((usr.mutations & CLOWN) && prob(50)) t = "funny-looking" usr << text("This is a []\icon[][]. It is a [] item.", !src.blood_DNA ? "" : "bloody ",src, src.name, t) usr << src.desc return @@ -198,7 +198,7 @@ if (istype(affecting, /datum/organ/external)) var/b_dam = (src.damtype == "brute" ? src.force : 0) var/f_dam = (src.damtype == "fire" ? src.force : 0) - if (M.mutations & 2) + if (M.mutations & COLD_RESISTANCE) f_dam = 0 if (def_zone == "head") if (b_dam && H.isarmored(affecting) && prob(80 - src.force)) @@ -325,7 +325,7 @@ if (istype(location, /turf/simulated)) location.add_blood_floor(M) if("fire") - if (!(M.mutations & 2)) + if (!(M.mutations & COLD_RESISTANCE)) M.take_organ_damage(0, power) M << "Aargh it burns!" M.updatehealth() @@ -358,7 +358,7 @@ return src.add_fingerprint(user) - //if((user.mutations & 16) && prob(50)) + //if((user.mutations & CLOWN) && prob(50)) // M = user /* M << "\red You stab yourself in the eye." diff --git a/code/game/objects/items/weapons/grenades.dm b/code/game/objects/items/weapons/grenades.dm index 25520451976..84bde4525a6 100644 --- a/code/game/objects/items/weapons/grenades.dm +++ b/code/game/objects/items/weapons/grenades.dm @@ -7,7 +7,7 @@ FLASHBANG /obj/item/weapon/empgrenade/afterattack(atom/target as mob|obj|turf|area, mob/user as mob) if (user.equipped() == src) - if ((user.mutations & 16) && prob(50)) + if ((user.mutations & CLOWN) && prob(50)) user << "\red Huh? How does this thing work?!" src.state = 1 src.icon_state = "empar" @@ -64,7 +64,7 @@ FLASHBANG /obj/item/weapon/flashbang/afterattack(atom/target as mob|obj|turf|area, mob/user as mob) if (user.equipped() == src) - if ((user.mutations & 16) && prob(50)) + if ((user.mutations & CLOWN) && prob(50)) user << "\red Huh? How does this thing work?!" src.state = 1 src.icon_state = "flashbang1" @@ -108,8 +108,8 @@ FLASHBANG S.icon_state = "shield0" if ((get_dist(M, T) <= 2 || src.loc == M.loc || src.loc == M)) flick("e_flash", M.flash) - if(!(M.mutations & 8)) M.stunned = 10 - if(!(M.mutations & 8)) M.weakened = 3 + if(!(M.mutations & HULK)) M.stunned = 10 + if(!(M.mutations & HULK)) M.weakened = 3 M << "\red BANG" if ((prob(14) || (M == src.loc && prob(70)))) M.ear_damage += rand(1, 10) @@ -136,8 +136,8 @@ FLASHBANG if (get_dist(M, T) <= 5) flick("e_flash", M.flash) if (!( istype(M, /mob/living/carbon/human) )) - if(!(M.mutations & 8)) M.stunned = 7 - if(!(M.mutations & 8)) M.weakened = 2 + if(!(M.mutations & HULK)) M.stunned = 7 + if(!(M.mutations & HULK)) M.weakened = 2 else var/mob/living/carbon/human/H = M M.ear_deaf += 10 @@ -151,8 +151,8 @@ FLASHBANG safe = 1 if(!safe) - if(!(M.mutations & 8)) M.stunned = 7 - if(!(M.mutations & 8)) M.weakened = 2 + if(!(M.mutations & HULK)) M.stunned = 7 + if(!(M.mutations & HULK)) M.weakened = 2 else if (!( M.paralysis )) M.eye_stat += rand(1, 3) @@ -197,7 +197,7 @@ FLASHBANG /obj/item/weapon/flashbang/attack_self(mob/user as mob) if (!src.state) - if (user.mutations & 16) + if (user.mutations & CLOWN) user << "\red Huh? How does this thing work?!" spawn( 5 ) prime() @@ -214,7 +214,7 @@ FLASHBANG /obj/item/weapon/empgrenade/attack_self(mob/user as mob) if (!src.state) - if (user.mutations & 16) + if (user.mutations & CLOWN) user << "\red Huh? How does this thing work?!" spawn( 5 ) prime() diff --git a/code/game/objects/items/weapons/guns_ammo.dm b/code/game/objects/items/weapons/guns_ammo.dm index f80c7be7f94..320df2a2a07 100644 --- a/code/game/objects/items/weapons/guns_ammo.dm +++ b/code/game/objects/items/weapons/guns_ammo.dm @@ -37,7 +37,7 @@ TELEPORT GUN var/mode = 1//I guess I'll leave this here in case another mode to the weapon is added./N afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob, flag) - if ((user.mutations & 16) && prob(50)) + if ((user.mutations & CLOWN) && prob(50)) user << "\red The pulse rifle blows up in your face." user.take_organ_damage(0,20) user.drop_item() @@ -585,7 +585,7 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/li /obj/item/weapon/gun/energy/laser_gun/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob, flag) - if ((user.mutations & 16) && prob(50)) + if ((user.mutations & CLOWN) && prob(50)) user << "\red The laser gun blows up in your face." user.take_organ_damage(0,20) user.drop_item() @@ -719,7 +719,7 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/li /obj/item/weapon/gun/energy/taser_gun/attack(mob/M as mob, mob/living/user as mob) - if ((usr.mutations & 16) && prob(50)) + if ((usr.mutations & CLOWN) && prob(50)) usr << "\red The taser gun discharges in your hand." usr.paralysis += 60 return @@ -732,11 +732,11 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/li if (user.a_intent == "hurt") if (!..()) return if (prob(20)) - if (M.paralysis < 10 && (!(M.mutations & 8)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) + if (M.paralysis < 10 && (!(M.mutations & HULK)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) M.paralysis = 10 - else if (M.weakened < 10 && (!(M.mutations & 8)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) + else if (M.weakened < 10 && (!(M.mutations & HULK)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) M.weakened = 10 - if (M.stuttering < 10 && (!(M.mutations & 8)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) + if (M.stuttering < 10 && (!(M.mutations & HULK)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) M.stuttering = 10 if(M.stat != 2) M.stat = 1 @@ -744,12 +744,12 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/li O.show_message("\red [M] has been knocked unconscious!", 1, "\red You hear someone fall", 2) else if (prob(50)) - if (M.paralysis < 60 && (!(M.mutations & 8)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) + if (M.paralysis < 60 && (!(M.mutations & HULK)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) M.paralysis = 60 else - if (M.weakened < 60 && (!(M.mutations & 8)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) + if (M.weakened < 60 && (!(M.mutations & HULK)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) M.weakened = 60 - if (M.stuttering < 60 && (!(M.mutations & 8)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) + if (M.stuttering < 60 && (!(M.mutations & HULK)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) M.stuttering = 60 if(M.stat != 2) M.stat = 1 for(var/mob/O in viewers(M, null)) @@ -764,23 +764,23 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/li if (user.a_intent == "hurt") if (!..()) return if (prob(20)) - if (M.paralysis < 10 && (!(M.mutations & 8)) ) + if (M.paralysis < 10 && (!(M.mutations & HULK)) ) M.paralysis = 10 - else if (M.weakened < 10 && (!(M.mutations & 8)) ) + else if (M.weakened < 10 && (!(M.mutations & HULK)) ) M.weakened = 10 - if (M.stuttering < 10 && (!(M.mutations & 8)) ) + if (M.stuttering < 10 && (!(M.mutations & HULK)) ) M.stuttering = 10 if(M.stat != 2) M.stat = 1 for(var/mob/O in viewers(M, null)) O.show_message("\red [M] has been knocked unconscious!", 1, "\red You hear someone fall", 2) else if (prob(50)) - if (M.paralysis < 60 && (!(M.mutations & 8)) ) + if (M.paralysis < 60 && (!(M.mutations & HULK)) ) M.paralysis = 60 else - if (M.weakened < 60 && (!(M.mutations & 8)) ) + if (M.weakened < 60 && (!(M.mutations & HULK)) ) M.weakened = 60 - if (M.stuttering < 60 && (!(M.mutations & 8)) ) + if (M.stuttering < 60 && (!(M.mutations & HULK)) ) M.stuttering = 60 if(M.stat != 2) M.stat = 1 for(var/mob/O in viewers(M, null)) @@ -935,7 +935,7 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/li return /obj/item/weapon/gun/energy/teleport_gun/attack(mob/M as mob, mob/living/user as mob) - if ((usr.mutations & 16) && prob(50)) + if ((usr.mutations & CLOWN) && prob(50)) usr << "\red You shoot the teleport gun while holding it backwards." point_blank_teleport(usr) return @@ -1069,7 +1069,7 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/li src.icon_state = text("energy[]", ratio) afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob, flag) - if ((user.mutations & 16) && prob(50)) + if ((user.mutations & CLOWN) && prob(50)) user << "\red The energy gun blows up in your face." user.take_organ_damage(0,20) user.drop_item() diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index 78900b7e056..c2074200974 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -37,7 +37,7 @@ KNIFE src.icon_state = "fork" return else - if((user.mutations & 16) && prob(50)) + if((user.mutations & CLOWN) && prob(50)) M = user return eyestab(M,user) @@ -47,7 +47,7 @@ KNIFE // ROLLING PIN /obj/item/weapon/kitchen/rollingpin/attack(mob/M as mob, mob/living/user as mob) - if ((user.mutations & 16) && prob(50)) + if ((user.mutations & CLOWN) && prob(50)) user << "\red The [src] slips out of your hand and hits your head." user.take_organ_damage(10) user.paralysis += 2 @@ -60,10 +60,10 @@ KNIFE return var/time = rand(2, 6) if (prob(75)) - if (M.paralysis < time && (!(M.mutations & 8)) ) + if (M.paralysis < time && (!(M.mutations & HULK)) ) M.paralysis = time else - if (M.stunned < time && (!(M.mutations & 8)) ) + if (M.stunned < time && (!(M.mutations & HULK)) ) M.stunned = time if(M.stat != 2) M.stat = 1 for(var/mob/O in viewers(M, null)) @@ -81,7 +81,7 @@ KNIFE // KNIFE /obj/item/weapon/kitchen/utensil/knife/attack(target as mob, mob/living/user as mob) - if ((user.mutations & 16) && prob(50)) + if ((user.mutations & CLOWN) && prob(50)) user << "\red You accidentally cut yourself with the [src]." user.take_organ_damage(20) return @@ -90,7 +90,7 @@ KNIFE ///////////////////////////////// TRAY -Agouri :3 /////////////////////////////////////////////// /obj/item/weapon/tray/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) - if((user.mutations & 16) && prob(50)) //What if he's a clown? + if((user.mutations & CLOWN) && prob(50)) //What if he's a clown? M << "\red You accidentally slam yourself with the [src]!" M.weakened += 1 user.take_organ_damage(2) diff --git a/code/game/objects/items/weapons/papers_bins.dm b/code/game/objects/items/weapons/papers_bins.dm index f81ca018ae8..e3368be2131 100644 --- a/code/game/objects/items/weapons/papers_bins.dm +++ b/code/game/objects/items/weapons/papers_bins.dm @@ -191,7 +191,7 @@ CLIPBOARDS return /obj/item/weapon/paper/attack_self(mob/living/user as mob) - if ((user.mutations & 16) && prob(50)) + if ((user.mutations & CLOWN) && prob(50)) user << text("\red You cut yourself on the paper.") user.take_organ_damage(3) return @@ -203,11 +203,11 @@ CLIPBOARDS return /obj/item/weapon/paper/attack_ai(var/mob/living/silicon/ai/user as mob) - var/dist + var/dist if (istype(user) && user.current) //is AI - dist = get_dist(src, user.current) + dist = get_dist(src, user.current) else //cyborg or AI not seeing through a camera - dist = get_dist(src, user) + dist = get_dist(src, user) if (dist < 2) usr << browse(text("[][]", src.name, src.info), text("window=[]", src.name)) onclose(usr, "[src.name]") diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index 0cd63f8b8ce..1e13b69e0a2 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -201,7 +201,7 @@ CIRCULAR SAW if(!istype(M)) return ..() - if((user.mutations & 16) && prob(50)) + if((user.mutations & CLOWN) && prob(50)) M = user return eyestab(M,user) @@ -351,7 +351,7 @@ CIRCULAR SAW if(!istype(M)) return ..() - if((user.mutations & 16) && prob(50)) + if((user.mutations & CLOWN) && prob(50)) M = user return eyestab(M,user) @@ -398,7 +398,7 @@ CIRCULAR SAW M.updatehealth() else M.take_organ_damage(40) - + if(istype(M, /mob/living/carbon/human)) var/datum/organ/external/affecting = M:organs["head"] affecting.take_damage(7) diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index f61ebb2c85c..9508f556944 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -17,7 +17,7 @@ STUN BATON color = pick("red","blue","green","purple") /obj/item/weapon/sword/attack_self(mob/living/user as mob) - if ((user.mutations & 16) && prob(50)) + if ((user.mutations & CLOWN) && prob(50)) user << "\red You accidentally cut yourself with [src]." user.take_organ_damage(5,5) src.active = !( src.active ) @@ -98,7 +98,7 @@ STUN BATON /obj/item/weapon/baton/attack_self(mob/user as mob) src.status = !( src.status ) - if ((usr.mutations & 16) && prob(50)) + if ((usr.mutations & CLOWN) && prob(50)) usr << "\red You grab the stunbaton on the wrong side." usr.paralysis += 60 return @@ -114,7 +114,7 @@ STUN BATON return /obj/item/weapon/baton/attack(mob/M as mob, mob/user as mob) - if ((usr.mutations & 16) && prob(50)) + if ((usr.mutations & CLOWN) && prob(50)) usr << "\red You grab the stunbaton on the wrong side." usr.weakened += 30 return @@ -133,7 +133,7 @@ STUN BATON for(var/mob/O in viewers(M, null)) if (O.client) O.show_message(text("\red [] has blocked []'s stun baton with the riot shield!", M, user), 1, "\red You hear a cracking sound", 2) return*/ - if (M.weakened < 5 && (!(M.mutations & 8)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) + if (M.weakened < 5 && (!(M.mutations & HULK)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) M.weakened = 5 for(var/mob/O in viewers(M)) if (O.client) O.show_message("\red [M] has been beaten with the stun baton by [user]!", 1) @@ -164,11 +164,11 @@ STUN BATON R.cell.charge -= 20 else charges-- - if (M.weakened < 1 && (!(M.mutations & 8)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) + if (M.weakened < 1 && (!(M.mutations & HULK)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) M.weakened = 1 - if (M.stuttering < 1 && (!(M.mutations & 8)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) + if (M.stuttering < 1 && (!(M.mutations & HULK)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) M.stuttering = 1 - if (M.stunned < 1 && (!(M.mutations & 8)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) + if (M.stunned < 1 && (!(M.mutations & HULK)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) M.stunned = 1 else /* if (!istype(H:r_hand, /obj/item/weapon/shield/riot) && prob(40)) @@ -185,11 +185,11 @@ STUN BATON R.cell.charge -= 20 else charges-- - if (M.weakened < 10 && (!(M.mutations & 8)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) + if (M.weakened < 10 && (!(M.mutations & HULK)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) M.weakened = 10 - if (M.stuttering < 10 && (!(M.mutations & 8)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) + if (M.stuttering < 10 && (!(M.mutations & HULK)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) M.stuttering = 10 - if (M.stunned < 10 && (!(M.mutations & 8)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) + if (M.stunned < 10 && (!(M.mutations & HULK)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) M.stunned = 10 user.lastattacked = M M.lastattacker = user @@ -204,7 +204,7 @@ STUN BATON charges -= 5 /obj/item/weapon/classic_baton/attack(mob/M as mob, mob/living/user as mob) - if ((user.mutations & 16) && prob(50)) + if ((user.mutations & CLOWN) && prob(50)) user << "\red You club yourself over the head." user.weakened = max(3 * force, user.weakened) if(ishuman(user)) @@ -218,19 +218,19 @@ STUN BATON if (user.a_intent == "hurt") if(!..()) return playsound(src.loc, "swing_hit", 50, 1, -1) - if (M.weakened < 8 && (!(M.mutations & 8)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) + if (M.weakened < 8 && (!(M.mutations & HULK)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) M.weakened = 8 - if (M.stuttering < 8 && (!(M.mutations & 8)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) + if (M.stuttering < 8 && (!(M.mutations & HULK)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) M.stuttering = 8 - if (M.stunned < 8 && (!(M.mutations & 8)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) + if (M.stunned < 8 && (!(M.mutations & HULK)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) M.stunned = 8 for(var/mob/O in viewers(M)) if (O.client) O.show_message("\red [M] has been beaten with the police baton by [user]!", 1, "\red You hear someone fall", 2) else playsound(src.loc, 'Genhit.ogg', 50, 1, -1) - if (M.weakened < 5 && (!(M.mutations & 8)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) + if (M.weakened < 5 && (!(M.mutations & HULK)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) M.weakened = 5 - if (M.stunned < 5 && (!(M.mutations & 8)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) + if (M.stunned < 5 && (!(M.mutations & HULK)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) M.stunned = 5 for(var/mob/O in viewers(M)) if (O.client) O.show_message("\red [M] has been stunned with the police baton by [user]!", 1, "\red You hear someone fall", 2) diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 670f4d64909..5187d11d888 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -29,7 +29,7 @@ WELDINGTOOOL if(user.zone_sel.selecting != "eyes" && user.zone_sel.selecting != "head") return ..() - if((user.mutations & 16) && prob(50)) + if((user.mutations & CLOWN) && prob(50)) M = user return eyestab(M,user) diff --git a/code/game/objects/livestock.dm b/code/game/objects/livestock.dm index 2a0c25b8d62..4b741599193 100644 --- a/code/game/objects/livestock.dm +++ b/code/game/objects/livestock.dm @@ -322,7 +322,7 @@ special_extra() if(isnull(trg_idle)) //No one to follow? Find one. for(var/mob/living/O in viewers(world.view,src)) - if(O.mutations == (0 || 16)) //Hates mutants and fatties. + if(O.mutations == (0 || CLOWN)) //Hates mutants and fatties. trg_idle = O break if(isnull(trg_idle)) //Still no one to follow? Step in a random direction. diff --git a/code/game/objects/new_year.dm b/code/game/objects/new_year.dm index 34c546d2240..a31dd4a0bc0 100644 --- a/code/game/objects/new_year.dm +++ b/code/game/objects/new_year.dm @@ -28,14 +28,14 @@ /* y1=a*x1+b y2=a*x2+b b = y2-a*x2 - + y1=a*x1+ y2-a*x2 a*(x1-x2)+y2-y1=0 a = (y1-y2)/(x1-x2) */ var/a = (top_left_y-bottom_right_y)/(top_left_x-bottom_med_x) var/b = bottom_right_y-a*bottom_med_x - + if (a*x+b < y) //if point is above diagonal top_left -> bottom_median x = bottom_med_x + x - top_left_x y = bottom_right_y - y + top_left_y @@ -59,7 +59,7 @@ /obj/item/weapon/firbang/afterattack(atom/target as mob|obj|turf|area, mob/user as mob) if (user.equipped() == src) - if ((user.mutations & 16) && prob(50)) + if ((user.mutations & CLOWN) && prob(50)) user << "\red Huh? How does this thing work?!" src.state = 1 src.icon_state = "flashbang1" @@ -107,7 +107,7 @@ /obj/item/weapon/firbang/attack_self(mob/user as mob) if (!src.state) - if (user.mutations & 16) + if (user.mutations & CLOWN) user << "\red Huh? How does this thing work?!" spawn( 5 ) prime() @@ -121,7 +121,7 @@ prime() return return - + /* /datum/supply_packs/new_year name = "New Year Celebration Equipment" diff --git a/code/game/objects/secstorage/sbriefcase.dm b/code/game/objects/secstorage/sbriefcase.dm index 200f1433c0f..af6dfa30e8a 100644 --- a/code/game/objects/secstorage/sbriefcase.dm +++ b/code/game/objects/secstorage/sbriefcase.dm @@ -16,7 +16,7 @@ new /obj/item/weapon/pen(src) /obj/item/weapon/secstorage/sbriefcase/attack(mob/M as mob, mob/living/user as mob) - if ((user.mutations & 16) && prob(50)) + if ((user.mutations & CLOWN) && prob(50)) user << "\red The [src] slips out of your hand and hits your head." user.take_organ_damage(10) user.paralysis += 2 diff --git a/code/game/objects/storage/bible.dm b/code/game/objects/storage/bible.dm index 0277f456962..7f913edaecb 100644 --- a/code/game/objects/storage/bible.dm +++ b/code/game/objects/storage/bible.dm @@ -34,7 +34,7 @@ user.take_organ_damage(0,10) return - if ((user.mutations & 16) && prob(50)) + if ((user.mutations & CLOWN) && prob(50)) user << "\red The [src] slips out of your hand and hits your head." user.take_organ_damage(10) user.paralysis += 20 @@ -48,7 +48,7 @@ if(M.mind in ticker.mode.cult) if (ticker.mode.name == "cult") ticker.mode:remove_cultist(M.mind) - else + else ticker.mode.cult -= M.mind if ((istype(M, /mob/living/carbon/human) && prob(60))) bless(M) diff --git a/code/game/objects/storage/briefcase.dm b/code/game/objects/storage/briefcase.dm index dc36d7f3770..b10c61ec20e 100644 --- a/code/game/objects/storage/briefcase.dm +++ b/code/game/objects/storage/briefcase.dm @@ -11,7 +11,7 @@ /obj/item/weapon/storage/briefcase/attack(mob/M as mob, mob/living/user as mob) //..() - if ((user.mutations & 16) && prob(50)) + if ((user.mutations & CLOWN) && prob(50)) user << "\red The [src] slips out of your hand and hits your head." user.take_organ_damage(10) user.paralysis += 2 @@ -25,10 +25,10 @@ return var/time = rand(2, 6) if (prob(75)) - if (M.paralysis < time && (!(M.mutations & 8)) ) + if (M.paralysis < time && (!(M.mutations & HULK)) ) M.paralysis = time else - if (M.stunned < time && (!(M.mutations & 8)) ) + if (M.stunned < time && (!(M.mutations & HULK)) ) M.stunned = time if(M.stat != 2) M.stat = 1 for(var/mob/O in viewers(M, null)) diff --git a/code/game/objects/tables_racks.dm b/code/game/objects/tables_racks.dm index 64278ceec21..46d3ae15658 100644 --- a/code/game/objects/tables_racks.dm +++ b/code/game/objects/tables_racks.dm @@ -35,7 +35,7 @@ TABLE AND RACK OBJECT INTERATIONS return /obj/table/attack_paw(mob/user as mob) - if ((usr.mutations & 8)) + if ((usr.mutations & HULK)) usr << text("\blue You destroy the table.") for(var/mob/O in oviewers()) if ((O.client && !( O.blinded ))) @@ -74,7 +74,7 @@ TABLE AND RACK OBJECT INTERATIONS return /obj/table/attack_hand(mob/user as mob) - if ((usr.mutations & 8)) + if ((usr.mutations & HULK)) usr << text("\blue You destroy the table.") for(var/mob/O in oviewers()) if ((O.client && !( O.blinded ))) diff --git a/code/game/objects/weapons.dm b/code/game/objects/weapons.dm index 999c8e6a369..97c567ba6ff 100644 --- a/code/game/objects/weapons.dm +++ b/code/game/objects/weapons.dm @@ -196,7 +196,7 @@ R.part3 = W R.part3.master = R del(src) - + /* WTF THIS SHIT? It is working? Shouldn't. --rastaf0 W.loc = R R.part1 = W @@ -1243,7 +1243,7 @@ user << "\blue You arm the mousetrap." else icon_state = "mousetrap" - if((user.brainloss >= 60 || user.mutations & 16) && prob(50)) + if((user.brainloss >= 60 || user.mutations & CLOWN) && prob(50)) var/which_hand = "l_hand" if(!user.hand) which_hand = "r_hand" @@ -1260,7 +1260,7 @@ /obj/item/weapon/mousetrap/attack_hand(mob/user as mob) if(armed) - if((user.brainloss >= 60 || user.mutations & 16) && prob(50)) + if((user.brainloss >= 60 || user.mutations & CLOWN) && prob(50)) var/which_hand = "l_hand" if(!user.hand) which_hand = "r_hand" diff --git a/code/game/objects/window.dm b/code/game/objects/window.dm index 0e823e3a7ad..51e96553ff3 100644 --- a/code/game/objects/window.dm +++ b/code/game/objects/window.dm @@ -100,7 +100,7 @@ return /obj/window/attack_hand() - if ((usr.mutations & 8)) + if ((usr.mutations & HULK)) usr << text("\blue You smash through the window.") for(var/mob/O in oviewers()) if ((O.client && !( O.blinded ))) @@ -113,7 +113,7 @@ return /obj/window/attack_paw() - if ((usr.mutations & 8)) + if ((usr.mutations & HULK)) usr << text("\blue You smash through the window.") for(var/mob/O in oviewers()) if ((O.client && !( O.blinded ))) diff --git a/code/game/turf.dm b/code/game/turf.dm index 477e8a44918..2264cdb0954 100644 --- a/code/game/turf.dm +++ b/code/game/turf.dm @@ -290,7 +290,7 @@ dismantle_wall() /turf/simulated/wall/attack_paw(mob/user as mob) - if ((user.mutations & 8)) + if ((user.mutations & HULK)) if (prob(40)) usr << text("\blue You smash through the wall.") dismantle_wall(1) @@ -302,7 +302,7 @@ return src.attack_hand(user) /turf/simulated/wall/attack_hand(mob/user as mob) - if ((user.mutations & 8)) + if ((user.mutations & HULK)) if (prob(40)) usr << text("\blue You smash through the wall.") dismantle_wall(1) diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm index 73edf48e3e7..01e5a479848 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm @@ -27,7 +27,7 @@ handle_regular_hud_updates() - if (src.stat == 2 || src.mutations & 4) + if (src.stat == 2 || src.mutations & XRAY) src.sight |= SEE_TURFS src.sight |= SEE_MOBS src.sight |= SEE_OBJS diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm index baef5f3930e..24fb8ad4e1d 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm @@ -27,7 +27,7 @@ handle_regular_hud_updates() - if (src.stat == 2 || src.mutations & 4) + if (src.stat == 2 || src.mutations & XRAY) src.sight |= SEE_TURFS src.sight |= SEE_MOBS src.sight |= SEE_OBJS diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index 42f7d5d9c85..72201f125b8 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -635,7 +635,7 @@ if ("hurt") var/damage = rand(1, 9) if (prob(90)) - if (M.mutations & 8)//HULK SMASH + if (M.mutations & HULK)//HULK SMASH damage += 14 spawn(0) src.paralysis += 5 diff --git a/code/modules/mob/living/carbon/alien/humanoid/life_new.dm b/code/modules/mob/living/carbon/alien/humanoid/life_new.dm index f4994a26b58..4749f5949c7 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/life_new.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/life_new.dm @@ -112,15 +112,15 @@ handle_mutations_and_radiation() if(src.fireloss) - if(src.mutations & 2 || prob(50)) + if(src.mutations & COLD_RESISTANCE || prob(50)) switch(src.fireloss) if(1 to 50) src.fireloss-- if(51 to 100) src.fireloss -= 5 - if (src.mutations & 8 && src.health <= 25) - src.mutations &= ~8 + if (src.mutations & HULK && src.health <= 25) + src.mutations &= ~HULK src << "\red You suddenly feel very weak." src.weakened = 3 emote("collapse") @@ -259,7 +259,7 @@ breath.toxins -= toxins_used breath.oxygen += toxins_used - if(breath.temperature > (T0C+66) && !(src.mutations & 2)) // Hot air hurts :( + if(breath.temperature > (T0C+66) && !(src.mutations & COLD_RESISTANCE)) // Hot air hurts :( if(prob(20)) src << "\red You feel a searing heat in your lungs!" fire_alert = max(fire_alert, 1) @@ -317,7 +317,7 @@ thermal_protection += 0.2 if(wear_suit && (wear_suit.flags & SUITSPACE)) thermal_protection += 3 - if(src.mutations & 2) + if(src.mutations & COLD_RESISTANCE) thermal_protection += 5 return thermal_protection @@ -341,15 +341,15 @@ if(reagents) reagents.metabolize(src) - if(src.nutrition > 500 && !(src.mutations & 32)) + if(src.nutrition > 500 && !(src.mutations & FAT)) if(prob(5 + round((src.nutrition - 200) / 2))) src << "\red You suddenly feel blubbery!" - src.mutations |= 32 + src.mutations |= FAT // update_body() - if (src.nutrition < 100 && src.mutations & 32) + if (src.nutrition < 100 && src.mutations & FAT) if(prob(round((50 - src.nutrition) / 100))) src << "\blue You feel fit again!" - src.mutations &= ~32 + src.mutations &= ~FAT // update_body() if (src.nutrition > 0) src.nutrition -= HUNGER_FACTOR @@ -460,7 +460,7 @@ handle_regular_hud_updates() - if (src.stat == 2 || src.mutations & 4) + if (src.stat == 2 || src.mutations & XRAY) src.sight |= SEE_TURFS src.sight |= SEE_MOBS src.sight |= SEE_OBJS diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm index 448f4e4fa42..0bf82227606 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm @@ -30,7 +30,7 @@ handle_regular_hud_updates() - if (src.stat == 2 || src.mutations & 4) + if (src.stat == 2 || src.mutations & XRAY) src.sight |= SEE_TURFS src.sight |= SEE_MOBS src.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 4bbcb04e191..0a8dbccc926 100644 --- a/code/modules/mob/living/carbon/alien/larva/larva.dm +++ b/code/modules/mob/living/carbon/alien/larva/larva.dm @@ -22,7 +22,7 @@ src.now_pushing = 1 if(ismob(AM)) var/mob/tmob = AM - if(istype(tmob, /mob/living/carbon/human) && tmob.mutations & 32) + if(istype(tmob, /mob/living/carbon/human) && tmob.mutations & FAT) if(prob(70)) for(var/mob/M in viewers(src, null)) if(M.client) @@ -427,7 +427,7 @@ else var/damage = rand(1, 9) if (prob(90)) - if (M.mutations & 8) + if (M.mutations & HULK) damage += 5 spawn(0) src.paralysis += 1 diff --git a/code/modules/mob/living/carbon/alien/larva/life.dm b/code/modules/mob/living/carbon/alien/larva/life.dm index 2afd55e1758..379324212f2 100644 --- a/code/modules/mob/living/carbon/alien/larva/life.dm +++ b/code/modules/mob/living/carbon/alien/larva/life.dm @@ -246,7 +246,7 @@ breath.toxins -= toxins_used breath.oxygen += toxins_used - if(breath.temperature > (T0C+66) && !(src.mutations & 2)) // Hot air hurts :( + if(breath.temperature > (T0C+66) && !(src.mutations & COLD_RESISTANCE)) // Hot air hurts :( if(prob(20)) src << "\red You feel a searing heat in your lungs!" fire_alert = max(fire_alert, 1) @@ -274,15 +274,15 @@ if(reagents) reagents.metabolize(src) - if(src.nutrition > 500 && !(src.mutations & 32)) + if(src.nutrition > 500 && !(src.mutations & FAT)) if(prob(5 + round((src.nutrition - 200) / 2))) src << "\red You suddenly feel blubbery!" - src.mutations |= 32 + src.mutations |= FAT // update_body() - if (src.nutrition < 100 && src.mutations & 32) + if (src.nutrition < 100 && src.mutations & FAT) if(prob(round((50 - src.nutrition) / 100))) src << "\blue You feel fit again!" - src.mutations &= ~32 + src.mutations &= ~FAT // update_body() if (src.nutrition > 0) src.nutrition-= HUNGER_FACTOR @@ -393,7 +393,7 @@ handle_regular_hud_updates() - if (src.stat == 2 || src.mutations & 4) + if (src.stat == 2 || src.mutations & XRAY) src.sight |= SEE_TURFS src.sight |= SEE_MOBS src.sight |= SEE_OBJS diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm index ce2c315ea2f..a125fb76539 100644 --- a/code/modules/mob/living/carbon/brain/life.dm +++ b/code/modules/mob/living/carbon/brain/life.dm @@ -266,7 +266,7 @@ handle_regular_hud_updates() - if (src.stat == 2 || src.mutations & 4) + if (src.stat == 2 || src.mutations & XRAY) src.sight |= SEE_TURFS src.sight |= SEE_MOBS src.sight |= SEE_OBJS diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 03af026cdd0..b6b798978da 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -5,7 +5,7 @@ src.nutrition -= HUNGER_FACTOR/10 if(src.m_intent == "run") src.nutrition -= HUNGER_FACTOR/10 - if(src.mutations & 32 && src.m_intent == "run" && src.bodytemperature <= 360) + if(src.mutations & FAT && src.m_intent == "run" && src.bodytemperature <= 360) src.bodytemperature += 2 /mob/living/carbon/relaymove(var/mob/user, direction) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 163154ce411..8140b57eea4 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -78,7 +78,7 @@ var/obj/item/weapon/W = src.equipped() if (world.time > src.lastDblClick+2) src.lastDblClick = world.time - if((prob(40)) || (prob(95) && src.mutations & 16)) + if((prob(40)) || (prob(95) && src.mutations & CLOWN)) //src << "\red You accidentally stun yourself with the [W.name]." src.visible_message("\red [src] accidentally stun \himself with the [W.name].", \ "\red You accidentally stun yourself with the [W.name].") @@ -92,8 +92,8 @@ W:charges-- src.now_pushing = 0 return - if(istype(tmob, /mob/living/carbon/human) && tmob.mutations & 32) - if(prob(40) && !(src.mutations & 32)) + if(istype(tmob, /mob/living/carbon/human) && tmob.mutations & FAT) + if(prob(40) && !(src.mutations & FAT)) src.visible_message("\red [src] fails to push [tmob]'s fat ass out of the way.", \ "\red You fail to push [tmob]'s fat ass out of the way.") src.now_pushing = 0 @@ -136,7 +136,7 @@ if(src.shoes) tally += src.shoes.slowdown - if(src.mutations & 32) + if(src.mutations & FAT) tally += 1.5 if (src.bodytemperature < 283.222) tally += (283.222 - src.bodytemperature) / 10 * 1.75 @@ -752,7 +752,7 @@ return if (!( istype(W, /obj/item/clothing/suit) )) return - if (src.mutations & 32 && !(W.flags & ONESIZEFITSALL)) + if (src.mutations & FAT && !(W.flags & ONESIZEFITSALL)) src << "\red You're too fat to wear the [W.name]!" return src.u_equip(W) @@ -830,7 +830,7 @@ return if (!( istype(W, /obj/item/clothing/under) )) return - if (src.mutations & 32 && !(W.flags & ONESIZEFITSALL)) + if (src.mutations & FAT && !(W.flags & ONESIZEFITSALL)) src << "\red You're too fat to wear the [W.name]!" return src.u_equip(W) @@ -1017,16 +1017,16 @@ // lol var/fat = "" - if (src.mutations & 32) + if (src.mutations & FAT) fat = "fat" - if (src.mutations & 8) + if (src.mutations & HULK) src.overlays += image("icon" = 'genetics.dmi', "icon_state" = "hulk[fat][!src.lying ? "_s" : "_l"]") - if (src.mutations & 2) + if (src.mutations & COLD_RESISTANCE) src.overlays += image("icon" = 'genetics.dmi', "icon_state" = "fire[fat][!src.lying ? "_s" : "_l"]") - if (src.mutations & 1) + if (src.mutations & PORTALS) src.overlays += image("icon" = 'genetics.dmi', "icon_state" = "telekinesishead[fat][!src.lying ? "_s" : "_l"]") if (src.mutantrace) @@ -1102,7 +1102,7 @@ // Uniform if (src.w_uniform) - if (src.mutations & 32 && !(src.w_uniform.flags & ONESIZEFITSALL)) + if (src.mutations & FAT && !(src.w_uniform.flags & ONESIZEFITSALL)) src << "\red You burst out of the [src.w_uniform.name]!" var/obj/item/clothing/c = src.w_uniform src.u_equip(c) @@ -1117,7 +1117,7 @@ var/t1 = src.w_uniform.color if (!t1) t1 = src.icon_state - if (src.mutations & 32) + if (src.mutations & FAT) src.overlays += image("icon" = 'uniform_fat.dmi', "icon_state" = "[t1][!src.lying ? "_s" : "_l"]", "layer" = MOB_LAYER) else src.overlays += image("icon" = 'uniform.dmi', "icon_state" = text("[][]",t1, (!(src.lying) ? "_s" : "_l")), "layer" = MOB_LAYER) @@ -1212,7 +1212,7 @@ if (src.wear_suit) - if (src.mutations & 32 && !(src.wear_suit.flags & ONESIZEFITSALL)) + if (src.mutations & FAT && !(src.wear_suit.flags & ONESIZEFITSALL)) src << "\red You burst out of the [src.wear_suit.name]!" var/obj/item/clothing/c = src.wear_suit src.u_equip(c) @@ -1700,7 +1700,7 @@ if (src.organs[text("[]", def_zone)]) affecting = src.organs[text("[]", def_zone)] if ((istype(affecting, /datum/organ/external) && prob(90))) - if (M.mutations & 8) + if (M.mutations & HULK) damage += 5 spawn(0) src.paralysis += 1 @@ -1819,8 +1819,8 @@ src.stand_icon = new /icon('human.dmi', "blank") src.lying_icon = new /icon('human.dmi', "blank") - var/husk = (src.mutations & 64) - var/obese = (src.mutations & 32) + var/husk = (src.mutations & HUSK) + var/obese = (src.mutations & FAT) if (husk) src.stand_icon.Blend(new /icon('human.dmi', "husk_s"), ICON_OVERLAY) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index e74a5b75836..f136c5e2ef8 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -181,11 +181,11 @@ handle_mutations_and_radiation() if(src.fireloss) - if(src.mutations & 2 || (prob(1) && prob(75))) + if(src.mutations & COLD_RESISTANCE || (prob(1) && prob(75))) src.heal_organ_damage(0,1) - if (src.mutations & 8 && src.health <= 25) - src.mutations &= ~8 + if (src.mutations & HULK && src.health <= 25) + src.mutations &= ~HULK src << "\red You suddenly feel very weak." src.weakened = 3 emote("collapse") @@ -384,7 +384,7 @@ spawn(0) emote(pick("giggle", "laugh")) - if(breath.temperature > (T0C+66) && !(src.mutations & 2)) // Hot air hurts :( + if(breath.temperature > (T0C+66) && !(src.mutations & COLD_RESISTANCE)) // Hot air hurts :( if(prob(20)) src << "\red You feel a searing heat in your lungs!" fire_alert = max(fire_alert, 1) @@ -530,7 +530,7 @@ thermal_protection += 3 if(head && (head.flags & HEADSPACE)) thermal_protection += 1 - if(src.mutations & 2) + if(src.mutations & COLD_RESISTANCE) thermal_protection += 5 return thermal_protection @@ -611,13 +611,13 @@ if(oxyloss) oxyloss-- - if(overeatduration > 500 && !(src.mutations & 32)) + if(overeatduration > 500 && !(src.mutations & FAT)) src << "\red You suddenly feel blubbery!" - src.mutations |= 32 + src.mutations |= FAT update_body() - if (overeatduration < 100 && src.mutations & 32) + if (overeatduration < 100 && src.mutations & FAT) src << "\blue You feel fit again!" - src.mutations &= ~32 + src.mutations &= ~FAT update_body() // nutrition decrease @@ -749,7 +749,7 @@ if(copytext(hud.icon_state,6) == "health") //ugly, but icon comparison is worse, I believe del(hud) - if (src.stat == 2 || src.mutations & 4) + if (src.stat == 2 || src.mutations & XRAY) src.sight |= SEE_TURFS src.sight |= SEE_MOBS src.sight |= SEE_OBJS diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index 2cfd8f8a633..55290495779 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -118,15 +118,15 @@ handle_mutations_and_radiation() if(src.fireloss) - if(src.mutations & 2 || prob(50)) + if(src.mutations & COLD_RESISTANCE || prob(50)) switch(src.fireloss) if(1 to 50) src.fireloss-- if(51 to 100) src.fireloss -= 5 - if (src.mutations & 8 && src.health <= 25) - src.mutations &= ~8 + if (src.mutations & HULK && src.health <= 25) + src.mutations &= ~HULK src << "\red You suddenly feel very weak." src.weakened = 3 emote("collapse") @@ -456,7 +456,7 @@ handle_regular_hud_updates() - if (src.stat == 2 || src.mutations & 4) + if (src.stat == 2 || src.mutations & XRAY) src.sight |= SEE_TURFS src.sight |= SEE_MOBS src.sight |= SEE_OBJS diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index ae7fa92473d..cbfe5c4b0a9 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -45,7 +45,7 @@ src.now_pushing = 1 if(ismob(AM)) var/mob/tmob = AM - if(istype(tmob, /mob/living/carbon/human) && tmob.mutations & 32) + if(istype(tmob, /mob/living/carbon/human) && tmob.mutations & FAT) if(prob(70)) for(var/mob/M in viewers(src, null)) if(M.client) @@ -147,7 +147,7 @@ for(var/mob/O in viewers(src, null)) O.show_message(text("\red [M.name] has bit []!", src), 1) var/damage = rand(1, 5) - if (src.mutations & 8) damage += 10 + if (src.mutations & HULK) damage += 10 src.bruteloss += damage src.updatehealth() else diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 13a2045c720..3797e3beb28 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -84,7 +84,7 @@ /mob/living/proc/burn_skin(burn_amount) if(istype(src, /mob/living/carbon/human)) //world << "DEBUG: burn_skin(), mutations=[mutations]" - if (src.mutations & 2) //fireproof + if (src.mutations & COLD_RESISTANCE) //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) @@ -102,7 +102,7 @@ H.updatehealth() return 1 else if(istype(src, /mob/living/carbon/monkey)) - if (src.mutations & 2) //fireproof + if (src.mutations & COLD_RESISTANCE) //fireproof return 0 var/mob/living/carbon/monkey/M = src M.fireloss += burn_amount diff --git a/code/modules/mob/living/silicon/hivebot/hivebot.dm b/code/modules/mob/living/silicon/hivebot/hivebot.dm index 01d9a9bed65..3c22d2c4582 100644 --- a/code/modules/mob/living/silicon/hivebot/hivebot.dm +++ b/code/modules/mob/living/silicon/hivebot/hivebot.dm @@ -161,7 +161,7 @@ src.now_pushing = 1 if(ismob(AM)) var/mob/tmob = AM - if(istype(tmob, /mob/living/carbon/human) && tmob.mutations & 32) + if(istype(tmob, /mob/living/carbon/human) && tmob.mutations & FAT) if(prob(20)) for(var/mob/M in viewers(src, null)) if(M.client) diff --git a/code/modules/mob/living/silicon/hivebot/life.dm b/code/modules/mob/living/silicon/hivebot/life.dm index 38a6cfdf896..e4b8a41ffa2 100644 --- a/code/modules/mob/living/silicon/hivebot/life.dm +++ b/code/modules/mob/living/silicon/hivebot/life.dm @@ -118,7 +118,7 @@ handle_regular_hud_updates() - if (src.stat == 2 || src.mutations & 4) + if (src.stat == 2 || src.mutations & XRAY) src.sight |= SEE_TURFS src.sight |= SEE_MOBS src.sight |= SEE_OBJS diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index 7ffb219282a..533ae30875c 100644 --- a/code/modules/mob/living/silicon/robot/life.dm +++ b/code/modules/mob/living/silicon/robot/life.dm @@ -149,7 +149,7 @@ handle_regular_hud_updates() - if (src.stat == 2 || src.mutations & 4 || src.sight_mode & BORGXRAY) + if (src.stat == 2 || src.mutations & XRAY || 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 896caa782de..45fd6e2e590 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -308,7 +308,7 @@ src.now_pushing = 1 if(ismob(AM)) var/mob/tmob = AM - if(istype(tmob, /mob/living/carbon/human) && tmob.mutations & 32) + if(istype(tmob, /mob/living/carbon/human) && tmob.mutations & FAT) if(prob(20)) for(var/mob/M in viewers(src, null)) if(M.client) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 794c64c68a1..df6b4002edc 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -407,7 +407,7 @@ if (src.state < 3) if(istype(src.affecting, /mob/living/carbon/human)) var/mob/living/carbon/human/H = src.affecting - if(H.mutations & 32) + if(H.mutations & FAT) src.assailant << "\blue You can't strangle [src.affecting] through all that fat!" return @@ -466,7 +466,7 @@ s_click(src.hud1) return if(M == src.assailant && src.state >= 2) - if( ( ishuman(user) && (user.mutations & 32) && ismonkey(src.affecting) ) || ( isalien(user) && iscarbon(src.affecting) ) ) + if( ( ishuman(user) && (user.mutations & FAT) && ismonkey(src.affecting) ) || ( isalien(user) && iscarbon(src.affecting) ) ) var/mob/living/carbon/attacker = user for(var/mob/N in viewers(user, null)) if(N.client) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 0bf96d9eee0..79e841888fa 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -201,7 +201,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 & 2) + //if(!user.mutations & COLD_RESISTANCE) if (prob(12)) electrocute_mob(user, get_area(src), src, 0.3) broken() @@ -216,7 +216,7 @@ var/datum/effects/system/spark_spread/s = new /datum/effects/system/spark_spread s.set_up(3, 1, src) s.start() - //if(!user.mutations & 2) + //if(!user.mutations & COLD_RESISTANCE) if (prob(75)) electrocute_mob(user, get_area(src), src, rand(0.7,1.0)) @@ -268,7 +268,7 @@ else prot = 1 - if(prot > 0 || (user.mutations & 2)) + if(prot > 0 || (user.mutations & COLD_RESISTANCE)) user << "You remove the light [fitting]" else user << "You try to remove the light [fitting], but you burn your hand on it!" diff --git a/code/setup.dm b/code/setup.dm index 45d64e3fbe5..6d27fcd6c68 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -123,6 +123,15 @@ #define ARMS 32 #define HANDS 64 +//bitflags for mutations +#define PORTALS 1 +#define COLD_RESISTANCE 2 +#define XRAY 4 +#define HULK 8 +#define CLOWN 16 +#define FAT 32 +#define HUSK 64 //changeling-drained + // channel numbers for power #define EQUIP 1 diff --git a/maps/tgstation.2.0.7.dmm b/maps/tgstation.2.0.7.dmm index cbd7def6d96..62ae17bedb5 100644 --- a/maps/tgstation.2.0.7.dmm +++ b/maps/tgstation.2.0.7.dmm @@ -2824,7 +2824,7 @@ "bcp" = (/obj/disposaloutlet{icon_state = "outlet"; dir = 8},/obj/disposalpipe/trunk{dir = 4},/turf/simulated/floor/plating,/area/quartermaster/sorting) "bcq" = (/obj/machinery/atmospherics/pipe/simple,/obj/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/port) "bcr" = (/obj/disposalpipe/junction{dir = 4; icon_state = "pipe-j2"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet) -"bcs" = (/obj/disposalpipe/segment{dir = 4},/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/table,/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet) +"bcs" = (/obj/disposalpipe/segment{dir = 4},/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/table,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet) "bct" = (/obj/disposalpipe/sortjunction{sortType = 6},/turf/simulated/wall,/area/maintenance/port) "bcu" = (/obj/machinery/atmospherics/pipe/simple{dir = 6},/obj/item/stack/sheet/rglass,/turf/simulated/floor/plating,/area/maintenance/port) "bcv" = (/obj/machinery/atmospherics/pipe/simple{dir = 4},/obj/item/weapon/screwdriver,/turf/simulated/floor/plating,/area/maintenance/port)