diff --git a/code/modules/mob/living/basic/basic_mob.dm b/code/modules/mob/living/basic/basic_mob.dm index 0ee47fd70a5..0b4a32c0cc6 100644 --- a/code/modules/mob/living/basic/basic_mob.dm +++ b/code/modules/mob/living/basic/basic_mob.dm @@ -22,6 +22,8 @@ RESTRICT_TYPE(/mob/living/basic) icon = 'icons/mob/animal.dmi' hud_type = /datum/hud/simple_animal + initial_traits = list(TRAIT_NOFIRE) + var/basic_mob_flags // State changes and data for alive/dead/gibbed. diff --git a/code/modules/mob/living/basic/hostile/bats.dm b/code/modules/mob/living/basic/hostile/bats.dm index df6cc13dbf8..7ab622f2585 100644 --- a/code/modules/mob/living/basic/hostile/bats.dm +++ b/code/modules/mob/living/basic/hostile/bats.dm @@ -33,7 +33,7 @@ faction = list("scarybat") gold_core_spawnable = HOSTILE_SPAWN - initial_traits = list(TRAIT_FLYING) + initial_traits = list(TRAIT_FLYING, TRAIT_NOFIRE) /mob/living/basic/scarybat/Initialize(mapload, mob/living/L) . = ..() diff --git a/code/modules/mob/living/basic/hostile/bees/bees.dm b/code/modules/mob/living/basic/hostile/bees/bees.dm index 280c1a8e1b7..45bd7404a44 100644 --- a/code/modules/mob/living/basic/hostile/bees/bees.dm +++ b/code/modules/mob/living/basic/hostile/bees/bees.dm @@ -42,7 +42,7 @@ minimum_survivable_temperature = 0 gold_core_spawnable = FRIENDLY_SPAWN basic_mob_flags = DEL_ON_DEATH - initial_traits = list(TRAIT_FLYING) + initial_traits = list(TRAIT_FLYING, TRAIT_NOFIRE) ai_controller = /datum/ai_controller/basic_controller/bee /// the reagent the bee has var/datum/reagent/beegent = null diff --git a/code/modules/mob/living/basic/hostile/carp.dm b/code/modules/mob/living/basic/hostile/carp.dm index 7f2f8cd692d..e1b356ded5b 100644 --- a/code/modules/mob/living/basic/hostile/carp.dm +++ b/code/modules/mob/living/basic/hostile/carp.dm @@ -39,7 +39,7 @@ pressure_resistance = 200 gold_core_spawnable = HOSTILE_SPAWN - initial_traits = list(TRAIT_FLYING, TRAIT_SHOCKIMMUNE) + initial_traits = list(TRAIT_FLYING, TRAIT_SHOCKIMMUNE, TRAIT_NOFIRE) var/random_color = TRUE // if the carp uses random coloring var/rarechance = 1 // chance for rare color variant diff --git a/code/modules/mob/living/basic/hostile/demons/pulse_demon.dm b/code/modules/mob/living/basic/hostile/demons/pulse_demon.dm index 008196555fa..887922934e8 100644 --- a/code/modules/mob/living/basic/hostile/demons/pulse_demon.dm +++ b/code/modules/mob/living/basic/hostile/demons/pulse_demon.dm @@ -51,7 +51,7 @@ // this makes the demon able to speak through holopads, due to the overriden say, PD cannot speak normally regardless universal_speak = TRUE loot = list(/obj/item/organ/internal/heart/demon/pulse) - initial_traits = list(TRAIT_FLYING) + initial_traits = list(TRAIT_FLYING, TRAIT_NOFIRE) /// List of sounds that is picked from when the demon speaks. var/list/speech_sounds = list("sound/voice/pdvoice1.ogg", "sound/voice/pdvoice2.ogg", "sound/voice/pdvoice3.ogg") diff --git a/code/modules/mob/living/basic/hostile/megafauna/basic_megafauna.dm b/code/modules/mob/living/basic/hostile/megafauna/basic_megafauna.dm index b6738239ebf..2fc696d79c3 100644 --- a/code/modules/mob/living/basic/hostile/megafauna/basic_megafauna.dm +++ b/code/modules/mob/living/basic/hostile/megafauna/basic_megafauna.dm @@ -23,7 +23,7 @@ mob_size = MOB_SIZE_LARGE layer = LARGE_MOB_LAYER // Looks weird with them slipping under mineral walls and cameras and shit otherwise flags_2 = IMMUNE_TO_SHUTTLECRUSH_2 - initial_traits = list(TRAIT_FLYING) + initial_traits = list(TRAIT_FLYING, TRAIT_NOFIRE) /// The loot the mob should drop if killed with a crusher var/list/crusher_loot = list() /// The type of medal it drops if on hard mode diff --git a/code/modules/mob/living/basic/hostile/megafauna/vox_armalis/vox_armalis.dm b/code/modules/mob/living/basic/hostile/megafauna/vox_armalis/vox_armalis.dm index da1727a154a..e3370aed334 100644 --- a/code/modules/mob/living/basic/hostile/megafauna/vox_armalis/vox_armalis.dm +++ b/code/modules/mob/living/basic/hostile/megafauna/vox_armalis/vox_armalis.dm @@ -25,7 +25,7 @@ projectile_sound = 'sound/weapons/bladeslice.ogg' ranged_burst_count = 2 ranged_cooldown = 0.5 SECONDS // It's player controlled, it can have player fire rates. - initial_traits = list() + initial_traits = list(TRAIT_NOFIRE) blood_color = "#2299FC" butcher_time = 40 SECONDS butcher_results = list( diff --git a/code/modules/mob/living/basic/hostile/revenant/revenant.dm b/code/modules/mob/living/basic/hostile/revenant/revenant.dm index 2e8203e765e..94adebde6b5 100644 --- a/code/modules/mob/living/basic/hostile/revenant/revenant.dm +++ b/code/modules/mob/living/basic/hostile/revenant/revenant.dm @@ -39,7 +39,7 @@ mob_size = MOB_SIZE_TINY pass_flags = PASSTABLE | PASSGRILLE | PASSMOB atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) - initial_traits = list(TRAIT_FLYING) + initial_traits = list(TRAIT_FLYING, TRAIT_NOFIRE) contains_xeno_organ = TRUE ignore_generic_organs = TRUE surgery_container = /datum/xenobiology_surgery_container/revenant diff --git a/code/modules/mob/living/basic/hostile/swarmers/swarmer.dm b/code/modules/mob/living/basic/hostile/swarmers/swarmer.dm index 65af220af22..90d69bf058d 100644 --- a/code/modules/mob/living/basic/hostile/swarmers/swarmer.dm +++ b/code/modules/mob/living/basic/hostile/swarmers/swarmer.dm @@ -36,7 +36,7 @@ loot = list(/obj/effect/decal/cleanable/blood/gibs/robot) death_message = "explodes with a sharp pop!" basic_mob_flags = DEL_ON_DEATH - initial_traits = list(TRAIT_FLYING) + initial_traits = list(TRAIT_FLYING, TRAIT_NOFIRE) sentience_type = SENTIENCE_OTHER // No, you cannot sentience or mind-transfer into them environment_smash = ENVIRONMENT_SMASH_RWALLS // EAT EVERYTHING step_type = FOOTSTEP_MOB_CLAW