cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 15:45:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes basic mobs being lit ablaze invisibly (#31801)

Browse Source 
* Fixes basic mobs being lit ablaze invisibly

* Snowflakes
This commit is contained in:
PollardTheDragon
2026-04-09 16:52:29 -04:00
committed by GitHub
parent cff45b319f
commit 8aeceae7dc
9 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/basic/basic_mob.dm
+2
View File
@@ -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.
code/modules/mob/living/basic/hostile/bats.dm
+1 -1
View File
@@ -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)
. = ..()
code/modules/mob/living/basic/hostile/bees/bees.dm
+1 -1
View File
@@ -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
code/modules/mob/living/basic/hostile/carp.dm
+1 -1
View File
@@ -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
code/modules/mob/living/basic/hostile/demons/pulse_demon.dm
+1 -1
View File
@@ -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")
code/modules/mob/living/basic/hostile/megafauna/basic_megafauna.dm
+1 -1
View File
@@ -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
code/modules/mob/living/basic/hostile/megafauna/vox_armalis/vox_armalis.dm
+1 -1
View File
@@ -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(
code/modules/mob/living/basic/hostile/revenant/revenant.dm
+1 -1
View File
@@ -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
code/modules/mob/living/basic/hostile/swarmers/swarmer.dm
+1 -1
View File
@@ -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