diff --git a/code/game/gamemodes/heist/heist.dm b/code/game/gamemodes/heist/heist.dm index 6b71348f054..16a452ac651 100644 --- a/code/game/gamemodes/heist/heist.dm +++ b/code/game/gamemodes/heist/heist.dm @@ -103,7 +103,6 @@ var/global/list/obj/cortical_stacks = list() //Stacks for 'leave nobody behind' vox.name = vox.real_name newraider.name = vox.name vox.age = rand(12,20) - vox.dna.mutantrace = "vox" vox.set_species("Vox") vox.languages = list() // Removing language from chargen. vox.flavor_text = "" diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm index 49ded54e4c5..c7d5853ae31 100644 --- a/code/modules/admin/verbs/modifyvariables.dm +++ b/code/modules/admin/verbs/modifyvariables.dm @@ -268,7 +268,7 @@ var/list/forbidden_varedit_object_types = list( /client/proc/modify_variables(var/atom/O, var/param_var_name = null, var/autodetect_class = 0) if(!check_rights(R_VAREDIT)) return - var/list/locked = list("vars", "key", "ckey", "client", "firemut", "ishulk", "telekinesis", "xray", "virus", "cuffed", "ka", "last_eaten", "icon", "icon_state", "mutantrace") + var/list/locked = list("vars", "key", "ckey", "client", "firemut", "ishulk", "telekinesis", "xray", "virus", "cuffed", "ka", "last_eaten", "icon", "icon_state") for(var/p in forbidden_varedit_object_types) if( istype(O,p) ) diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index f45154aaf52..1cfd5174c17 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -516,7 +516,6 @@ client/proc/one_click_antag() new_vox.real_name = capitalize(newname) new_vox.name = new_vox.real_name new_vox.age = rand(12,20) - new_vox.dna.mutantrace = "vox" new_vox.set_species("Vox") new_vox.languages = list() // Removing language from chargen. new_vox.flavor_text = "" diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 0ede8d0ba98..f472b070830 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -23,7 +23,6 @@ var/corpseidjob = null // Needs to be in quotes, such as "Clown" or "Chef." This just determines what the ID reads as, not their access var/corpseidaccess = null //This is for access. See access.dm for which jobs give what access. Again, put in quotes. Use "Captain" if you want it to be all access. var/corpseidicon = null //For setting it to be a gold, silver, centcomm etc ID - var/mutantrace = "human" var/timeofdeath = null var/coffin = 0 diff --git a/code/modules/computer3/file.dm b/code/modules/computer3/file.dm index 849312ec50e..1cbb363894a 100644 --- a/code/modules/computer3/file.dm +++ b/code/modules/computer3/file.dm @@ -140,7 +140,6 @@ /datum/file/data/genome/SE name = "Structural Enzymes" - var/mutantrace = null /datum/file/data/genome/UE name = "Unique Enzymes" diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index d6885fa8390..6c7c0ae9686 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -695,63 +695,6 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc return min(1,thermal_protection) - /* - proc/add_fire_protection(var/temp) - var/fire_prot = 0 - if(head) - if(head.protective_temperature > temp) - fire_prot += (head.protective_temperature/10) - if(wear_mask) - if(wear_mask.protective_temperature > temp) - fire_prot += (wear_mask.protective_temperature/10) - if(glasses) - if(glasses.protective_temperature > temp) - fire_prot += (glasses.protective_temperature/10) - if(ears) - if(ears.protective_temperature > temp) - fire_prot += (ears.protective_temperature/10) - if(wear_suit) - if(wear_suit.protective_temperature > temp) - fire_prot += (wear_suit.protective_temperature/10) - if(w_uniform) - if(w_uniform.protective_temperature > temp) - fire_prot += (w_uniform.protective_temperature/10) - if(gloves) - if(gloves.protective_temperature > temp) - fire_prot += (gloves.protective_temperature/10) - if(shoes) - if(shoes.protective_temperature > temp) - fire_prot += (shoes.protective_temperature/10) - - return fire_prot - - proc/handle_temperature_damage(body_part, exposed_temperature, exposed_intensity) - if(nodamage) - return - //world <<"body_part = [body_part], exposed_temperature = [exposed_temperature], exposed_intensity = [exposed_intensity]" - var/discomfort = min(abs(exposed_temperature - bodytemperature)*(exposed_intensity)/2000000, 1.0) - - if(exposed_temperature > bodytemperature) - discomfort *= 4 - - if(mutantrace == "plant") - discomfort *= TEMPERATURE_DAMAGE_COEFFICIENT * 2 //I don't like magic numbers. I'll make mutantraces a datum with vars sometime later. -- Urist - else - discomfort *= TEMPERATURE_DAMAGE_COEFFICIENT //Dangercon 2011 - now with less magic numbers! - //world <<"[discomfort]" - - switch(body_part) - if(HEAD) - apply_damage(2.5*discomfort, BURN, "head") - if(UPPER_TORSO) - apply_damage(2.5*discomfort, BURN, "chest") - if(LEGS) - apply_damage(0.6*discomfort, BURN, "l_leg") - apply_damage(0.6*discomfort, BURN, "r_leg") - if(ARMS) - apply_damage(0.4*discomfort, BURN, "l_arm") - apply_damage(0.4*discomfort, BURN, "r_arm") - */ proc/get_covered_bodyparts() var/covered = 0 @@ -1174,9 +1117,6 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc if("slime") see_in_dark = 3 see_invisible = SEE_INVISIBLE_LEVEL_ONE - if("shadow") - see_in_dark = 8 - see_invisible = SEE_INVISIBLE_OBSERVER_NOLIGHTING if(mind && mind.vampire) if((VAMP_VISION in mind.vampire.powers) && !(VAMP_FULL in mind.vampire.powers)) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 1358d8cc1b9..087159b6787 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -452,9 +452,6 @@ proc/get_damage_icon_part(damage_state, body_part) else overlays_standing[MUTANTRACE_LAYER] = null - if(!dna || !(dna.mutantrace in list("metroid"))) - update_body(0) - update_hair(0) if(update_icons) update_icons() diff --git a/code/modules/mob/living/carbon/monkey/diona.dm b/code/modules/mob/living/carbon/monkey/diona.dm index cec0ef681ac..97599c956fa 100644 --- a/code/modules/mob/living/carbon/monkey/diona.dm +++ b/code/modules/mob/living/carbon/monkey/diona.dm @@ -15,7 +15,6 @@ ..() gender = NEUTER - dna.mutantrace = "plant" greaterform = "Diona" add_language("Rootspeak") verbs -= /mob/living/carbon/monkey/verb/ventcrawl @@ -46,7 +45,6 @@ ..() gender = NEUTER - dna.mutantrace = "plant" greaterform = "Diona" add_language("Rootspeak") src.verbs += /mob/living/carbon/monkey/diona/proc/merge diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index 7d03ff94d40..fac2f461346 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -80,7 +80,6 @@ /mob/living/carbon/monkey/unathi/New() ..() - dna.mutantrace = "lizard" greaterform = "Unathi" dna.species = "Unathi" add_language("Sinta'unathi") @@ -88,7 +87,6 @@ /mob/living/carbon/monkey/skrell/New() ..() - dna.mutantrace = "skrell" greaterform = "Skrell" dna.species = "Skrell" add_language("Skrellian") @@ -96,7 +94,6 @@ /mob/living/carbon/monkey/tajara/New() ..() - dna.mutantrace = "tajaran" greaterform = "Tajaran" dna.species = "Tajaran" add_language("Siik'tajr") @@ -106,7 +103,6 @@ ..() alien = 1 gender = NEUTER - dna.mutantrace = "plant" greaterform = "Diona" dna.species = "Diona" add_language("Rootspeak") diff --git a/code/modules/mob/living/carbon/species.dm b/code/modules/mob/living/carbon/species.dm index fb6e4588a62..e0159cebdac 100644 --- a/code/modules/mob/living/carbon/species.dm +++ b/code/modules/mob/living/carbon/species.dm @@ -14,7 +14,6 @@ var/tail // Name of tail image in species effects icon file. var/unarmed //For empty hand harm-intent attack var/unarmed_type = /datum/unarmed_attack - var/mutantrace // Safeguard due to old code. var/breath_type = "oxygen" // Non-oxygen gas breathed, if any. var/poison_type = "plasma" // Poisonous air. diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 36e0ecaff12..430418dfaa8 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -104,7 +104,8 @@ M << "\red Your meaty finger is much too large for the trigger guard!" return if(ishuman(user)) - if(user.dna && user.dna.mutantrace == "adamantine") + var/mob/living/carbon/human/H = user + if(H.species.name == "Golem") user << "\red Your metal fingers don't fit in the trigger guard!" return @@ -128,7 +129,7 @@ if(!in_chamber) return - + if(heavy_weapon) if(user.get_inactive_hand()) recoil = 4 //one-handed kick @@ -154,7 +155,7 @@ user.visible_message("[user] fires [src][reflex ? " by reflex":""]!", \ "You fire [src][reflex ? "by reflex":""]!", \ "You hear a [istype(in_chamber, /obj/item/projectile/beam) ? "laser blast" : "gunshot"]!") - + if(heavy_weapon) if(user.get_inactive_hand()) if(prob(15)) diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index 74d91d2c4e3..506be488ea0 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -214,11 +214,6 @@ proc/wabbajack(mob/living/M) var/datum/preferences/A = new() //Randomize appearance for the human A.copy_to(new_mob) - var/mob/living/carbon/human/human/H = new_mob -// ready_dna(H) - if(H.dna) - H.dna.mutantrace = pick("lizard","plant","fly","skeleton",8;"") - H.update_body() else return diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index 3461b9a3856..77d5ea37bc8 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -96,7 +96,6 @@ on_hit(var/atom/target, var/blocked = 0) var/mob/living/M = target -// if(ishuman(target) && M.dna && M.dna.mutantrace == "plant") //Plantmen possibly get mutated and damaged by the rays. if(ishuman(target)) var/mob/living/carbon/human/H = M if((H.species.flags & IS_PLANT) && (M.nutrition < 500)) @@ -136,7 +135,6 @@ on_hit(var/atom/target, var/blocked = 0) var/mob/M = target -// if(ishuman(target) && M.dna && M.dna.mutantrace == "plant") //These rays make plantmen fat. if(ishuman(target)) //These rays make plantmen fat. var/mob/living/carbon/human/H = M if((H.species.flags & IS_PLANT) && (M.nutrition < 500)) diff --git a/code/modules/reagents/newchem/toxins.dm b/code/modules/reagents/newchem/toxins.dm index c173c5adbea..a052895ab46 100644 --- a/code/modules/reagents/newchem/toxins.dm +++ b/code/modules/reagents/newchem/toxins.dm @@ -602,7 +602,7 @@ datum/reagent/atrazine/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volu if(ismonkey(M)) var/mob/living/carbon/monkey/MO = M if(MO.dna) - if(MO.dna.mutantrace == "plant") //plantmen monkeys (diona) take EVEN MORE damage + if(istype(MO,/mob/living/carbon/monkey/diona)) //plantmen monkeys (diona) take EVEN MORE damage MO.adjustToxLoss(100) ..() return