Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Explosion smoke tweak #3569

Merged
merged 1 commit into from
Jul 23, 2024
Merged

Explosion smoke tweak #3569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/modules/halo/misc/custom_explosion.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa

if(approximate_intensity >= 2)
if(isnull(effect_datum_override))
if(approximate_intensity >= 4)
if(approximate_intensity >= 25)//Let's not make smoke unless we *really* need to.
effect_datum_override = /datum/effect/system/explosion/has_smoke
else
effect_datum_override = /datum/effect/system/explosion
Expand Down
15 changes: 8 additions & 7 deletions code/modules/mob/living/carbon/human/human.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,16 @@
var/throw_mob = FALSE
var/throw_range = 0
var/eyeflash_duration = 20
var/ear_damage_stats = null//list(ear damage add, ear damage upper cap, ear deaf add, ear deaf upper cap)
switch (severity)
if (1.0)
b_loss = 90
f_loss = 90
eyeflash_duration = 20
ear_damage_stats = list(30,50,120,120)
if (!prob(getarmor(null, "bomb")))
b_loss = 150
f_loss = 150
return
else
throw_mob = TRUE
throw_range = 200 //Be happy you survived the bomb's gibbing
Expand All @@ -124,21 +125,21 @@
f_loss = 60
eyeflash_duration = 10

if (!istype(l_ear, /obj/item/clothing/ears/earmuffs) && !istype(r_ear, /obj/item/clothing/ears/earmuffs))
ear_damage = min(ear_damage + 30,50*species.explosion_effect_mod)
ear_deaf = min(ear_damage + 120,120*species.explosion_effect_mod)
ear_damage_stats = list(30,50,120,120)
throw_mob = TRUE
throw_range = rand(world.view - 2,world.view)

if(3.0)
b_loss = 30
eyeflash_duration = 5
if (!istype(l_ear, /obj/item/clothing/ears/earmuffs) && !istype(r_ear, /obj/item/clothing/ears/earmuffs))
ear_damage = min(ear_damage + 15,50*species.explosion_effect_mod)
ear_deaf = min(ear_damage + 60,120*species.explosion_effect_mod)
ear_damage_stats = list(15,50,60,120)
throw_mob = TRUE
throw_range = rand(world.view - 4, world.view - 2)

if (!isnull(ear_damage_stats) && !istype(l_ear, /obj/item/clothing/ears/earmuffs) && !istype(r_ear, /obj/item/clothing/ears/earmuffs))
ear_damage = min(ear_damage + ear_damage_stats[1],ear_damage_stats[2]*species.explosion_effect_mod)
ear_deaf = min(ear_damage + ear_damage_stats[3],ear_damage_stats[4]*species.explosion_effect_mod)

if(!blinded)
flash_eyes(FLASH_PROTECTION_MODERATE,FALSE,FALSE,FALSE, /obj/screen/fullscreen/flash, eyeflash_duration)

Expand Down
Loading