From 6d0c5dcdf4c4a3cd1db3d0094a91a6478e1e449b Mon Sep 17 00:00:00 2001 From: GuillaumePrata <55374212+GuillaumePrata@users.noreply.github.com> Date: Tue, 14 Jun 2022 04:52:56 -0300 Subject: [PATCH] Changes species' `inherent_traits` to alphabetical order (#67745) * Changes species' `inherent_traits` to alphabetical order * Removed trait is back --- .../carbon/human/species_types/abductors.dm | 4 +- .../carbon/human/species_types/android.dm | 28 +-- .../carbon/human/species_types/dullahan.dm | 4 +- .../carbon/human/species_types/golems.dm | 198 +++++++++--------- .../carbon/human/species_types/jellypeople.dm | 2 +- .../human/species_types/lizardpeople.dm | 6 +- .../carbon/human/species_types/monkeys.dm | 8 +- .../carbon/human/species_types/mushpeople.dm | 2 +- .../carbon/human/species_types/plasmamen.dm | 6 +- .../carbon/human/species_types/podpeople.dm | 2 +- .../human/species_types/shadowpeople.dm | 4 +- .../carbon/human/species_types/skeletons.dm | 26 +-- .../carbon/human/species_types/vampire.dm | 4 +- .../carbon/human/species_types/zombies.dm | 22 +- 14 files changed, 158 insertions(+), 158 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species_types/abductors.dm b/code/modules/mob/living/carbon/human/species_types/abductors.dm index 959e79cda73..f3a8f04c5a2 100644 --- a/code/modules/mob/living/carbon/human/species_types/abductors.dm +++ b/code/modules/mob/living/carbon/human/species_types/abductors.dm @@ -7,11 +7,11 @@ inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, TRAIT_CAN_STRIP, - TRAIT_VIRUSIMMUNE, TRAIT_CHUNKYFINGERS, - TRAIT_NOHUNGER, TRAIT_NOBREATH, + TRAIT_NOHUNGER, TRAIT_LITERATE, + TRAIT_VIRUSIMMUNE, ) mutanttongue = /obj/item/organ/internal/tongue/abductor changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT diff --git a/code/modules/mob/living/carbon/human/species_types/android.dm b/code/modules/mob/living/carbon/human/species_types/android.dm index 5d46dc4caf7..14846670a23 100644 --- a/code/modules/mob/living/carbon/human/species_types/android.dm +++ b/code/modules/mob/living/carbon/human/species_types/android.dm @@ -6,22 +6,22 @@ inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, TRAIT_CAN_STRIP, - TRAIT_NOMETABOLISM, - TRAIT_TOXIMMUNE, - TRAIT_RESISTHEAT, - TRAIT_NOBREATH, - TRAIT_RESISTCOLD, - TRAIT_RESISTHIGHPRESSURE, - TRAIT_RESISTLOWPRESSURE, - TRAIT_RADIMMUNE, - TRAIT_GENELESS, - TRAIT_NOFIRE, - TRAIT_PIERCEIMMUNE, - TRAIT_NOHUNGER, - TRAIT_LIMBATTACHMENT, - TRAIT_NOCLONELOSS, TRAIT_CAN_USE_FLIGHT_POTION, + TRAIT_GENELESS, + TRAIT_LIMBATTACHMENT, TRAIT_LITERATE, + TRAIT_NOBREATH, + TRAIT_NOCLONELOSS, + TRAIT_NOFIRE, + TRAIT_NOHUNGER, + TRAIT_NOMETABOLISM, + TRAIT_PIERCEIMMUNE, + TRAIT_RADIMMUNE, + TRAIT_RESISTCOLD, + TRAIT_RESISTHEAT, + TRAIT_RESISTLOWPRESSURE, + TRAIT_RESISTHIGHPRESSURE, + TRAIT_TOXIMMUNE, ) inherent_biotypes = MOB_ROBOTIC|MOB_HUMANOID meat = null diff --git a/code/modules/mob/living/carbon/human/species_types/dullahan.dm b/code/modules/mob/living/carbon/human/species_types/dullahan.dm index e85958258db..6282ebe156a 100644 --- a/code/modules/mob/living/carbon/human/species_types/dullahan.dm +++ b/code/modules/mob/living/carbon/human/species_types/dullahan.dm @@ -5,9 +5,9 @@ inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, TRAIT_CAN_STRIP, - TRAIT_NOHUNGER, - TRAIT_NOBREATH, TRAIT_LITERATE, + TRAIT_NOBREATH, + TRAIT_NOHUNGER, ) inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID mutant_bodyparts = list("wings" = "None") diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index 210f856bd10..dc9965112ed 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -6,18 +6,18 @@ inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, TRAIT_CAN_STRIP, - TRAIT_RESISTHEAT, + TRAIT_CHUNKYFINGERS, + TRAIT_GENELESS, + TRAIT_LITERATE, TRAIT_NOBREATH, + TRAIT_NODISMEMBER, + TRAIT_NOFIRE, + TRAIT_PIERCEIMMUNE, + TRAIT_RADIMMUNE, TRAIT_RESISTCOLD, + TRAIT_RESISTHEAT, TRAIT_RESISTHIGHPRESSURE, TRAIT_RESISTLOWPRESSURE, - TRAIT_NOFIRE, - TRAIT_CHUNKYFINGERS, - TRAIT_RADIMMUNE, - TRAIT_GENELESS, - TRAIT_PIERCEIMMUNE, - TRAIT_NODISMEMBER, - TRAIT_LITERATE, ) inherent_biotypes = MOB_HUMANOID|MOB_MINERAL mutant_organs = list(/obj/item/organ/internal/adamantine_resonator) @@ -116,16 +116,16 @@ inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, TRAIT_CAN_STRIP, + TRAIT_CHUNKYFINGERS, + TRAIT_GENELESS, + TRAIT_LITERATE, TRAIT_NOBREATH, + TRAIT_NODISMEMBER, + TRAIT_PIERCEIMMUNE, + TRAIT_RADIMMUNE, TRAIT_RESISTCOLD, TRAIT_RESISTHIGHPRESSURE, TRAIT_RESISTLOWPRESSURE, - TRAIT_CHUNKYFINGERS, - TRAIT_RADIMMUNE, - TRAIT_GENELESS, - TRAIT_PIERCEIMMUNE, - TRAIT_NODISMEMBER, - TRAIT_LITERATE, ) info_text = "As a Plasma Golem, you burn easily. Be careful, if you get hot enough while burning, you'll blow up!" heatmod = 0 //fine until they blow up @@ -327,16 +327,16 @@ inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, TRAIT_CAN_STRIP, - TRAIT_NOBREATH, - TRAIT_RESISTCOLD, - TRAIT_RESISTHIGHPRESSURE, - TRAIT_RESISTLOWPRESSURE, TRAIT_CHUNKYFINGERS, - TRAIT_RADIMMUNE, TRAIT_GENELESS, - TRAIT_PIERCEIMMUNE, - TRAIT_NODISMEMBER, TRAIT_LITERATE, + TRAIT_NOBREATH, + TRAIT_NODISMEMBER, + TRAIT_PIERCEIMMUNE, + TRAIT_RADIMMUNE, + TRAIT_RESISTCOLD, + TRAIT_RESISTLOWPRESSURE, + TRAIT_RESISTHIGHPRESSURE, ) inherent_biotypes = MOB_ORGANIC | MOB_HUMANOID | MOB_PLANT armor = 30 @@ -596,19 +596,19 @@ inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, TRAIT_CAN_STRIP, - TRAIT_RESISTHEAT, - TRAIT_NOBREATH, - TRAIT_RESISTCOLD, - TRAIT_RESISTHIGHPRESSURE, - TRAIT_RESISTLOWPRESSURE, - TRAIT_NOFIRE, TRAIT_CHUNKYFINGERS, TRAIT_CLUMSY, - TRAIT_RADIMMUNE, TRAIT_GENELESS, - TRAIT_PIERCEIMMUNE, - TRAIT_NODISMEMBER, TRAIT_LITERATE, + TRAIT_NOBREATH, + TRAIT_NODISMEMBER, + TRAIT_NOFIRE, + TRAIT_PIERCEIMMUNE, + TRAIT_RADIMMUNE, + TRAIT_RESISTCOLD, + TRAIT_RESISTHEAT, + TRAIT_RESISTHIGHPRESSURE, + TRAIT_RESISTLOWPRESSURE, ) punchdamagelow = 0 punchdamagehigh = 1 @@ -705,19 +705,19 @@ inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, TRAIT_CAN_STRIP, - TRAIT_NOFLASH, - TRAIT_RESISTHEAT, - TRAIT_NOBREATH, - TRAIT_RESISTCOLD, - TRAIT_RESISTHIGHPRESSURE, - TRAIT_RESISTLOWPRESSURE, - TRAIT_NOFIRE, TRAIT_CHUNKYFINGERS, - TRAIT_RADIMMUNE, TRAIT_GENELESS, - TRAIT_PIERCEIMMUNE, - TRAIT_NODISMEMBER, TRAIT_LITERATE, + TRAIT_NOBREATH, + TRAIT_NODISMEMBER, + TRAIT_NOFIRE, + TRAIT_NOFLASH, + TRAIT_PIERCEIMMUNE, + TRAIT_RADIMMUNE, + TRAIT_RESISTHEAT, + TRAIT_RESISTCOLD, + TRAIT_RESISTLOWPRESSURE, + TRAIT_RESISTHIGHPRESSURE, ) inherent_biotypes = MOB_HUMANOID|MOB_MINERAL prefix = "Runic" @@ -784,16 +784,16 @@ inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, TRAIT_CAN_STRIP, - TRAIT_RESISTCOLD, + TRAIT_CHUNKYFINGERS, + TRAIT_GENELESS, + TRAIT_LITERATE, TRAIT_NOBREATH, + TRAIT_NODISMEMBER, + TRAIT_PIERCEIMMUNE, + TRAIT_RADIMMUNE, + TRAIT_RESISTCOLD, TRAIT_RESISTHIGHPRESSURE, TRAIT_RESISTLOWPRESSURE, - TRAIT_RADIMMUNE, - TRAIT_GENELESS, - TRAIT_PIERCEIMMUNE, - TRAIT_NODISMEMBER, - TRAIT_CHUNKYFINGERS, - TRAIT_LITERATE, ) inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID armor = 15 //feels no pain, but not too resistant @@ -957,19 +957,19 @@ inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, TRAIT_CAN_STRIP, - TRAIT_RESISTHEAT, + TRAIT_CHUNKYFINGERS, + TRAIT_GENELESS, + TRAIT_LITERATE, TRAIT_NOBREATH, + TRAIT_NODISMEMBER, + TRAIT_NOFIRE, + TRAIT_PIERCEIMMUNE, + TRAIT_RADIMMUNE, TRAIT_RESISTCOLD, + TRAIT_RESISTHEAT, TRAIT_RESISTHIGHPRESSURE, TRAIT_RESISTLOWPRESSURE, - TRAIT_NOFIRE, - TRAIT_CHUNKYFINGERS, - TRAIT_RADIMMUNE, - TRAIT_GENELESS, - TRAIT_PIERCEIMMUNE, - TRAIT_NODISMEMBER, TRAIT_VENTCRAWLER_NUDE, - TRAIT_LITERATE, ) prefix = "Plastic" special_names = list("Sheet", "Bag", "Bottle") @@ -1057,17 +1057,17 @@ inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, TRAIT_CAN_STRIP, + TRAIT_CHUNKYFINGERS, + TRAIT_GENELESS, + TRAIT_LITERATE, TRAIT_NOBREATH, + TRAIT_NODISMEMBER, + TRAIT_NOFLASH, + TRAIT_PIERCEIMMUNE, + TRAIT_RADIMMUNE, TRAIT_RESISTCOLD, TRAIT_RESISTHIGHPRESSURE, TRAIT_RESISTLOWPRESSURE, - TRAIT_CHUNKYFINGERS, - TRAIT_RADIMMUNE, - TRAIT_GENELESS, - TRAIT_PIERCEIMMUNE, - TRAIT_NODISMEMBER, - TRAIT_NOFLASH, - TRAIT_LITERATE, ) attack_verb = "whips" attack_sound = 'sound/weapons/whip.ogg' @@ -1123,17 +1123,17 @@ inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, TRAIT_CAN_STRIP, + TRAIT_CHUNKYFINGERS, + TRAIT_GENELESS, + TRAIT_LITERATE, TRAIT_NOBREATH, + TRAIT_NODISMEMBER, + TRAIT_PIERCEIMMUNE, + TRAIT_RADIMMUNE, TRAIT_RESISTCOLD, TRAIT_RESISTHIGHPRESSURE, TRAIT_RESISTLOWPRESSURE, - TRAIT_CHUNKYFINGERS, - TRAIT_RADIMMUNE, - TRAIT_GENELESS, - TRAIT_PIERCEIMMUNE, - TRAIT_NODISMEMBER, TRAIT_STRONG_GRABBER, - TRAIT_LITERATE, ) prefix = "Leather" fixed_mut_color = "#624a2e" @@ -1151,17 +1151,17 @@ inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, TRAIT_CAN_STRIP, + TRAIT_CHUNKYFINGERS, + TRAIT_GENELESS, + TRAIT_LITERATE, TRAIT_NOBREATH, + TRAIT_NODISMEMBER, + TRAIT_NOFLASH, + TRAIT_PIERCEIMMUNE, + TRAIT_RADIMMUNE, TRAIT_RESISTCOLD, TRAIT_RESISTHIGHPRESSURE, TRAIT_RESISTLOWPRESSURE, - TRAIT_CHUNKYFINGERS, - TRAIT_RADIMMUNE, - TRAIT_GENELESS, - TRAIT_PIERCEIMMUNE, - TRAIT_NODISMEMBER, - TRAIT_NOFLASH, - TRAIT_LITERATE, ) info_text = "As a Durathread Golem, your strikes will cause those your targets to start choking, but your woven body won't withstand fire as well." bodypart_overrides = list( @@ -1194,20 +1194,20 @@ inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, TRAIT_CAN_STRIP, - TRAIT_NOFLASH, - TRAIT_RESISTHEAT, + TRAIT_CHUNKYFINGERS, + TRAIT_FAKEDEATH, + TRAIT_GENELESS, + TRAIT_LITERATE, TRAIT_NOBREATH, + TRAIT_NOFIRE, + TRAIT_NODISMEMBER, + TRAIT_NOFLASH, + TRAIT_PIERCEIMMUNE, + TRAIT_RADIMMUNE, TRAIT_RESISTCOLD, + TRAIT_RESISTHEAT, TRAIT_RESISTHIGHPRESSURE, TRAIT_RESISTLOWPRESSURE, - TRAIT_NOFIRE, - TRAIT_CHUNKYFINGERS, - TRAIT_RADIMMUNE, - TRAIT_GENELESS, - TRAIT_PIERCEIMMUNE, - TRAIT_NODISMEMBER, - TRAIT_FAKEDEATH, - TRAIT_LITERATE, ) species_language_holder = /datum/language_holder/golem/bone info_text = "As a Bone Golem, You have a powerful spell that lets you chill your enemies with fear, and milk heals you! Just make sure to watch our for bone-hurting juice." @@ -1308,16 +1308,16 @@ inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, TRAIT_CAN_STRIP, + TRAIT_CHUNKYFINGERS, + TRAIT_GENELESS, + TRAIT_LITERATE, TRAIT_NOBREATH, + TRAIT_NODISMEMBER, + TRAIT_PIERCEIMMUNE, + TRAIT_RADIMMUNE, TRAIT_RESISTCOLD, TRAIT_RESISTHIGHPRESSURE, TRAIT_RESISTLOWPRESSURE, - TRAIT_CHUNKYFINGERS, - TRAIT_RADIMMUNE, - TRAIT_GENELESS, - TRAIT_PIERCEIMMUNE, - TRAIT_NODISMEMBER, - TRAIT_LITERATE, ) bodypart_overrides = list( BODY_ZONE_L_ARM = /obj/item/bodypart/l_arm/golem/snow, @@ -1375,16 +1375,16 @@ inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, TRAIT_CAN_STRIP, - TRAIT_NOFLASH, - TRAIT_RESISTHEAT, - TRAIT_NOBREATH, - TRAIT_RESISTHIGHPRESSURE, - TRAIT_NOFIRE, - TRAIT_RADIMMUNE, - TRAIT_GENELESS, - TRAIT_NODISMEMBER, TRAIT_CHUNKYFINGERS, + TRAIT_GENELESS, TRAIT_LITERATE, + TRAIT_NOBREATH, + TRAIT_NODISMEMBER, + TRAIT_NOFIRE, + TRAIT_NOFLASH, + TRAIT_RADIMMUNE, + TRAIT_RESISTHEAT, + TRAIT_RESISTHIGHPRESSURE, ) examine_limb_id = SPECIES_GOLEM diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index ab6b4eea868..5f4e124e334 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -8,8 +8,8 @@ inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, TRAIT_CAN_STRIP, - TRAIT_TOXINLOVER, TRAIT_LITERATE, + TRAIT_TOXINLOVER, ) mutantlungs = /obj/item/organ/internal/lungs/slime meat = /obj/item/food/meat/slab/human/mutant/slime diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index b856955f96f..ed6e32420b6 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -136,8 +136,8 @@ Lizard subspecies: ASHWALKERS TRAIT_ADVANCEDTOOLUSER, TRAIT_CAN_STRIP, TRAIT_CHUNKYFINGERS, + //TRAIT_LITERATE, TRAIT_VIRUSIMMUNE, - //TRAIT_LITERATE, ashwalkers are uneducated hillbillies from lavaland ) species_language_holder = /datum/language_holder/lizard/ash digitigrade_customization = DIGITIGRADE_FORCED @@ -152,14 +152,14 @@ Lizard subspecies: SILVER SCALED inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, TRAIT_CAN_STRIP, + TRAIT_LITERATE, TRAIT_HOLY, TRAIT_NOBREATH, + TRAIT_PIERCEIMMUNE, TRAIT_RESISTHIGHPRESSURE, TRAIT_RESISTLOWPRESSURE, - TRAIT_PIERCEIMMUNE, TRAIT_VIRUSIMMUNE, TRAIT_WINE_TASTER, - TRAIT_LITERATE, ) species_language_holder = /datum/language_holder/lizard/silver mutanttongue = /obj/item/organ/internal/tongue/lizard/silver diff --git a/code/modules/mob/living/carbon/human/species_types/monkeys.dm b/code/modules/mob/living/carbon/human/species_types/monkeys.dm index 2f95629d20f..24d11a8e510 100644 --- a/code/modules/mob/living/carbon/human/species_types/monkeys.dm +++ b/code/modules/mob/living/carbon/human/species_types/monkeys.dm @@ -25,11 +25,11 @@ ) inherent_traits = list( TRAIT_CAN_STRIP, - TRAIT_VENTCRAWLER_NUDE, - TRAIT_PRIMITIVE, - TRAIT_WEAK_SOUL, TRAIT_GUN_NATURAL, - //TRAIT_LITERATE, monkeys shouldn't be able to read or write + //TRAIT_LITERATE, + TRAIT_PRIMITIVE, + TRAIT_VENTCRAWLER_NUDE, + TRAIT_WEAK_SOUL, ) no_equip = list( ITEM_SLOT_OCLOTHING, diff --git a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm index 551f5320b00..28e3e6259b5 100644 --- a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm @@ -14,9 +14,9 @@ inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, TRAIT_CAN_STRIP, + TRAIT_LITERATE, TRAIT_NOBREATH, TRAIT_NOFLASH, - TRAIT_LITERATE, ) inherent_factions = list("mushroom") speedmod = 1.5 //faster than golems but not by much diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm index a9dadf77e15..55a644b44a3 100644 --- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm +++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm @@ -10,12 +10,12 @@ inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, TRAIT_CAN_STRIP, - TRAIT_RESISTCOLD, - TRAIT_RADIMMUNE, TRAIT_GENELESS, - TRAIT_NOHUNGER, TRAIT_HARDLY_WOUNDED, TRAIT_LITERATE, + TRAIT_RADIMMUNE, + TRAIT_RESISTCOLD, + TRAIT_NOHUNGER, ) inherent_biotypes = MOB_HUMANOID|MOB_MINERAL diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm index c97af3b8abe..603958f9367 100644 --- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm @@ -7,8 +7,8 @@ inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, TRAIT_CAN_STRIP, - TRAIT_PLANT_SAFE, TRAIT_LITERATE, + TRAIT_PLANT_SAFE, ) external_organs = list( /obj/item/organ/external/pod_hair = "None", diff --git a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm index b2e2e95749f..cf033942be1 100644 --- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm @@ -9,10 +9,10 @@ inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, TRAIT_CAN_STRIP, + TRAIT_LITERATE, + TRAIT_NOBREATH, TRAIT_RADIMMUNE, TRAIT_VIRUSIMMUNE, - TRAIT_NOBREATH, - TRAIT_LITERATE, ) inherent_factions = list("faithless") changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC diff --git a/code/modules/mob/living/carbon/human/species_types/skeletons.dm b/code/modules/mob/living/carbon/human/species_types/skeletons.dm index 35f96d4e623..ac9714fc3d3 100644 --- a/code/modules/mob/living/carbon/human/species_types/skeletons.dm +++ b/code/modules/mob/living/carbon/human/species_types/skeletons.dm @@ -9,24 +9,24 @@ inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, TRAIT_CAN_STRIP, - TRAIT_NOMETABOLISM, - TRAIT_TOXIMMUNE, - TRAIT_RESISTHEAT, + TRAIT_CAN_USE_FLIGHT_POTION, + TRAIT_EASYDISMEMBER, + TRAIT_FAKEDEATH, + TRAIT_GENELESS, + TRAIT_LIMBATTACHMENT, + TRAIT_LITERATE, TRAIT_NOBREATH, + TRAIT_NOCLONELOSS, + TRAIT_NOHUNGER, + TRAIT_NOMETABOLISM, + TRAIT_RADIMMUNE, + TRAIT_PIERCEIMMUNE, TRAIT_RESISTCOLD, + TRAIT_RESISTHEAT, TRAIT_RESISTHIGHPRESSURE, TRAIT_RESISTLOWPRESSURE, - TRAIT_RADIMMUNE, - TRAIT_GENELESS, - TRAIT_PIERCEIMMUNE, - TRAIT_NOHUNGER, - TRAIT_EASYDISMEMBER, - TRAIT_LIMBATTACHMENT, - TRAIT_FAKEDEATH, + TRAIT_TOXIMMUNE, TRAIT_XENO_IMMUNE, - TRAIT_NOCLONELOSS, - TRAIT_CAN_USE_FLIGHT_POTION, - TRAIT_LITERATE, ) inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID mutanttongue = /obj/item/organ/internal/tongue/bone diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm index b8985058477..18e1483839d 100644 --- a/code/modules/mob/living/carbon/human/species_types/vampire.dm +++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm @@ -20,9 +20,9 @@ inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, TRAIT_CAN_STRIP, - TRAIT_NOHUNGER, - TRAIT_NOBREATH, TRAIT_LITERATE, + TRAIT_NOBREATH, + TRAIT_NOHUNGER, ) inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID mutant_bodyparts = list("wings" = "None") diff --git a/code/modules/mob/living/carbon/human/species_types/zombies.dm b/code/modules/mob/living/carbon/human/species_types/zombies.dm index 3793c4e628a..6cf04410528 100644 --- a/code/modules/mob/living/carbon/human/species_types/zombies.dm +++ b/code/modules/mob/living/carbon/human/species_types/zombies.dm @@ -11,21 +11,21 @@ inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, TRAIT_CAN_STRIP, - TRAIT_NOMETABOLISM, + TRAIT_EASILY_WOUNDED, + TRAIT_EASYDISMEMBER, + TRAIT_FAKEDEATH, + TRAIT_LIMBATTACHMENT, + TRAIT_LITERATE, + TRAIT_NOBREATH, + TRAIT_NOCLONELOSS, + TRAIT_NODEATH, TRAIT_NOHUNGER, - TRAIT_TOXIMMUNE, + TRAIT_NOMETABOLISM, + TRAIT_RADIMMUNE, TRAIT_RESISTCOLD, TRAIT_RESISTHIGHPRESSURE, TRAIT_RESISTLOWPRESSURE, - TRAIT_RADIMMUNE, - TRAIT_EASYDISMEMBER, - TRAIT_EASILY_WOUNDED, - TRAIT_LIMBATTACHMENT, - TRAIT_NOBREATH, - TRAIT_NODEATH, - TRAIT_FAKEDEATH, - TRAIT_NOCLONELOSS, - TRAIT_LITERATE, + TRAIT_TOXIMMUNE, ) inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID mutanttongue = /obj/item/organ/internal/tongue/zombie