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

Balances explosions for stamina combat #18602

Merged
merged 4 commits into from
Jul 28, 2022
Merged

Balances explosions for stamina combat #18602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0a07ca3
whats that beepi-
Inadvizable Jul 27, 2022
977f688
no longer can frag-12 nukies with it
Inadvizable Jul 27, 2022
440a74b
charlie review 1
Inadvizable Jul 28, 2022
fd99dcd
charlie review 2
Inadvizable Jul 28, 2022
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
6 changes: 4 additions & 2 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 @@ -240,22 +240,24 @@
limbs_amount = 4

if(EXPLODE_HEAVY)
var/stuntime = 5 SECONDS - (bomb_armor / 2) //Between no stun and 5 seconds of stun depending on bomb armor
brute_loss = 60
burn_loss = 60
if(bomb_armor)
brute_loss = 30 * (2 - round(bomb_armor * 0.01, 0.05))
burn_loss = brute_loss //Damage gets reduced from 120 to up to 60 combined brute+burn
if(check_ear_prot() < HEARING_PROTECTION_TOTAL)
AdjustEarDamage(30, 120)
Weaken(20 SECONDS - (bomb_armor * 1.6 / 10) SECONDS) //Between ~4 and ~20 seconds of knockdown depending on bomb armor
Weaken(stuntime)
KnockDown(stuntime * 3) //Up to 15 seconds of knockdown

if(EXPLODE_LIGHT)
brute_loss = 30
if(bomb_armor)
brute_loss = 15 * (2 - round(bomb_armor * 0.01, 0.05)) //Reduced from 30 to up to 15
if(check_ear_prot() < HEARING_PROTECTION_TOTAL)
AdjustEarDamage(15, 60)
Weaken(16 SECONDS - (bomb_armor * 1.6 / 10) SECONDS) //Between no knockdown to ~16 seconds depending on bomb armor
KnockDown(10 SECONDS - bomb_armor) //Between no knockdown to 10 seconds of knockdown depending on bomb armor
valid_limbs = list("l_hand", "l_foot", "r_hand", "r_foot")
limb_loss_chance = 25

Expand Down
1 change: 0 additions & 1 deletion code/modules/mob/living/carbon/human/human_defense.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
Contains most of the procs that are called when a mob is attacked by something

bullet_act
ex_act
meteor_act
emp_act

Expand Down
1 change: 0 additions & 1 deletion code/modules/projectiles/projectile/special.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,6 @@
/obj/item/projectile/bullet/frag12
name ="explosive slug"
damage = 15
weaken = 2 SECONDS
alwayslog = TRUE

/obj/item/projectile/bullet/frag12/on_hit(atom/target, blocked = 0)
Expand Down