cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Explosion log fixes (#32174)

Browse Source 
* Explosion log fixes

* Reformat

* Reformat

Co-authored-by: kanef <kanef9x@protonmail.com>
This commit is contained in:
kane-f
2022-03-12 01:13:56 +00:00
committed by GitHub
parent a5b08f232a
commit 37549a0084
7 changed files with 58 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
View File

@@ -49,10 +49,12 @@
var/b_loss = null
var/f_loss = null
var/dmg_phrase = ""
var/msg_admin = (src.key || src.ckey || (src.mind && src.mind.key)) && whodunnit
switch (severity)
if(1)
b_loss += 500
add_attacklogs(src, whodunnit, "got caught in an explosive blast from", addition = "Severity: [severity], Gibbed", admin_warn = TRUE)
add_attacklogs(src, whodunnit, "got caught in an explosive blast[whodunnit ? " from" : ""]", addition = "Severity: [severity], Gibbed", admin_warn = msg_admin)
gib()
return
@@ -62,7 +64,7 @@
f_loss += 60
ear_damage += 30
ear_deaf += 120
add_attacklogs(src, whodunnit, "got caught in an explosive blast from", addition = "Severity: [severity], Damage: [shielded ? "60" : "120"]", admin_warn = TRUE)
dmg_phrase = "Damage: [shielded ? "60" : "120"]"
if(3)
b_loss += 30
@@ -70,7 +72,9 @@
Paralyse(TRUE)
ear_damage += 15
ear_deaf += 60
add_attacklogs(src, whodunnit, "got caught in an explosive blast from", addition = "Severity: [severity], Damage: 30", admin_warn = TRUE)
dmg_phrase = "Damage: 30"
add_attacklogs(src, whodunnit, "got caught in an explosive blast[whodunnit ? " from" : ""]", addition = "Severity: [severity], [dmg_phrase]", admin_warn = msg_admin)
adjustBruteLoss(b_loss)
adjustFireLoss(f_loss)

10
code/modules/mob/living/carbon/alien/larva/larva.dm
View File

@@ -52,10 +52,12 @@
var/b_loss = null
var/f_loss = null
var/dmg_phrase = ""
var/msg_admin = (src.key || src.ckey || (src.mind && src.mind.key)) && whodunnit
switch (severity)
if(1)
b_loss += 500
add_attacklogs(src, whodunnit, "got caught in an explosive blast from", addition = "Severity: [severity], Gibbed", admin_warn = TRUE)
add_attacklogs(src, whodunnit, "got caught in an explosive blast[whodunnit ? " from" : ""]", addition = "Severity: [severity], Gibbed", admin_warn = msg_admin)
gib()
return
if(2)
@@ -63,14 +65,16 @@
f_loss += 60
ear_damage += 30
ear_deaf += 120
add_attacklogs(src, whodunnit, "got caught in an explosive blast from", addition = "Severity: [severity], Damage: 120", admin_warn = TRUE)
dmg_phrase = "Damage: 120"
if(3)
b_loss += 30
if(prob(50))
Paralyse(1)
ear_damage += 15
ear_deaf += 60
add_attacklogs(src, whodunnit, "got caught in an explosive blast from", addition = "Severity: [severity], Damage: 30", admin_warn = TRUE)
dmg_phrase = "Damage: 30"
add_attacklogs(src, whodunnit, "got caught in an explosive blast[whodunnit ? " from" : ""]", addition = "Severity: [severity], [dmg_phrase]", admin_warn = msg_admin)
adjustBruteLoss(b_loss)
adjustFireLoss(f_loss)

9
code/modules/mob/living/carbon/human/human_defense.dm
View File

@@ -419,12 +419,13 @@ emp_act
var/b_loss = null
var/f_loss = null
var/gotarmor = clamp(getarmor(null, "bomb"),0,100)
var/msg_admin = (src.key || src.ckey || (src.mind && src.mind.key)) && whodunnit
switch (severity)
if (BLOB_ACT_STRONG)
b_loss += 300
if(!prob(gotarmor)) //Percent chance equal to their armor resist to not gib instantly.
add_attacklogs(src, whodunnit, "got caught in an explosive blast[whodunnit ? " from" : ""]", addition = "Severity: [severity], Gibbed", admin_warn = msg_admin)
gib()
add_attacklogs(src, whodunnit, "got caught in an explosive blast from", addition = "Severity: [severity], Gibbed", admin_warn = TRUE)
return
else
var/atom/target = get_edge_target_turf(src, get_dir(src, get_step_away(src, src)))
@@ -441,13 +442,13 @@ emp_act
if (BLOB_ACT_MEDIUM)
if (stat == 2 && client)
add_attacklogs(src, whodunnit, "got caught in an explosive blast[whodunnit ? " from" : ""]", addition = "Severity: [severity], Gibbed", admin_warn = msg_admin)
gib()
add_attacklogs(src, whodunnit, "got caught in an explosive blast from", addition = "Severity: [severity], Gibbed", admin_warn = TRUE)
return
else if (stat == 2 && !client)
gibs(loc, virus2)
add_attacklogs(src, whodunnit, "got caught in an explosive blast from", addition = "Severity: [severity], Gibbed", admin_warn = TRUE)
add_attacklogs(src, whodunnit, "got caught in an explosive blast[whodunnit ? " from" : ""]", addition = "Severity: [severity], Gibbed", admin_warn = msg_admin)
qdel(src)
return
@@ -529,7 +530,7 @@ emp_act
if(LIMB_LEFT_ARM)
update |= temp.take_damage(b_loss * 0.05, f_loss * 0.05, used_weapon = weapon_message)
if(update)
add_attacklogs(src, whodunnit, "got caught in an explosive blast from", addition = "Severity: [severity]", admin_warn = TRUE)
add_attacklogs(src, whodunnit, "got caught in an explosive blast[whodunnit ? " from" : ""]", addition = "Severity: [severity]", admin_warn = msg_admin)
UpdateDamageIcon()

10
code/modules/mob/living/carbon/slime/slime.dm
View File

@@ -243,22 +243,26 @@
var/b_loss = null
var/f_loss = null
var/dmg_phrase = ""
var/msg_admin = (src.key || src.ckey || (src.mind && src.mind.key)) && whodunnit
switch (severity)
if (1.0)
b_loss += 500
add_attacklogs(src, whodunnit, "got caught in an explosive blast from", addition = "Severity: [severity], Gibbed", admin_warn = TRUE)
add_attacklogs(src, whodunnit, "got caught in an explosive blast[whodunnit ? " from" : ""]", addition = "Severity: [severity], Gibbed", admin_warn = msg_admin)
return
if (2.0)
b_loss += 60
f_loss += 60
add_attacklogs(src, whodunnit, "got caught in an explosive blast from", addition = "Severity: [severity], Damage: 120", admin_warn = TRUE)
dmg_phrase = "Damage: 120"
if(3.0)
b_loss += 30
add_attacklogs(src, whodunnit, "got caught in an explosive blast from", addition = "Severity: [severity], Damage: 30", admin_warn = TRUE)
dmg_phrase = "Damage: 30"
add_attacklogs(src, whodunnit, "got caught in an explosive blast[whodunnit ? " from" : ""]", addition = "Severity: [severity], [dmg_phrase]", admin_warn = msg_admin)
adjustBruteLoss(b_loss)
adjustFireLoss(f_loss)

24
code/modules/mob/living/silicon/ai/ai.dm
View File

@@ -439,21 +439,23 @@ var/list/ai_list = list()
// if(!blinded) (this is now in flash_eyes)
flash_eyes(visual = TRUE, affect_silicon = TRUE)
switch(severity)
if(1.0)
if(!isDead())
if(!isDead())
var/dmg_phrase = ""
var/msg_admin = (src.key || src.ckey || (src.mind && src.mind.key)) && whodunnit
switch(severity)
if(1.0)
adjustBruteLoss(100)
adjustFireLoss(100)
add_attacklogs(src, whodunnit, "got caught in an explosive blast from", addition = "Severity: [severity], Damage: 200", admin_warn = TRUE)
if(2.0)
if(!isDead())
dmg_phrase = "Damage: 200"
if(2.0)
adjustBruteLoss(60)
adjustFireLoss(60)
add_attacklogs(src, whodunnit, "got caught in an explosive blast from", addition = "Severity: [severity], Damage: 120", admin_warn = TRUE)
if(3.0)
if(!isDead())
dmg_phrase = "Damage: 120"
if(3.0)
adjustBruteLoss(30)
add_attacklogs(src, whodunnit, "got caught in an explosive blast from", addition = "Severity: [severity], Damage: 30", admin_warn = TRUE)
dmg_phrase = "Damage: 30"
add_attacklogs(src, whodunnit, "got caught in an explosive blast[whodunnit ? " from" : ""]", addition = "Severity: [severity], [dmg_phrase]", admin_warn = msg_admin)
updatehealth()
@@ -937,5 +939,5 @@ var/list/ai_list = list()
/mob/living/silicon/ai/update_perception()
if(ai_flags & HIGHRESCAMS)
client?.darkness_planemaster.alpha = 150
else
else
client?.darkness_planemaster.alpha = 255

22
code/modules/mob/living/silicon/robot/robot.dm
View File

@@ -465,23 +465,25 @@
flash_eyes(visual = TRUE, affect_silicon = TRUE)
switch(severity)
if(1.0)
if(!isDead())
if(!isDead())
var/dmg_phrase = ""
var/msg_admin = (src.key || src.ckey || (src.mind && src.mind.key)) && whodunnit
switch(severity)
if(1.0)
adjustBruteLoss(100)
adjustFireLoss(100)
add_attacklogs(src, whodunnit, "got caught in an explosive blast from", addition = "Severity: [severity], Damage: 200", admin_warn = TRUE)
add_attacklogs(src, whodunnit, "got caught in an explosive blast[whodunnit ? " from" : ""]", addition = "Severity: [severity], Gibbed", admin_warn = msg_admin)
gib()
return
if(2.0)
if(!isDead())
if(2.0)
adjustBruteLoss(60)
adjustFireLoss(60)
add_attacklogs(src, whodunnit, "got caught in an explosive blast from", addition = "Severity: [severity], Damage: 120", admin_warn = TRUE)
if(3.0)
if(!isDead())
dmg_phrase = "Damage: 120"
if(3.0)
adjustBruteLoss(30)
add_attacklogs(src, whodunnit, "got caught in an explosive blast from", addition = "Severity: [severity], Damage: 30", admin_warn = TRUE)
dmg_phrase = "Damage: 30"
add_attacklogs(src, whodunnit, "got caught in an explosive blast[whodunnit ? " from" : ""]", addition = "Severity: [severity], [dmg_phrase]", admin_warn = msg_admin)
updatehealth()

10
code/modules/mob/living/simple_animal/simple_animal.dm
View File

@@ -585,20 +585,24 @@ var/global/list/animal_count = list() //Stores types, and amount of animals of t
if(flags & INVULNERABLE)
return
..()
var/dmg_phrase = ""
var/msg_admin = (src.key || src.ckey || (src.mind && src.mind.key)) && whodunnit
switch (severity)
if (1.0)
adjustBruteLoss(500)
add_attacklogs(src, whodunnit, "got caught in an explosive blast from", addition = "Severity: [severity], Gibbed", admin_warn = TRUE)
add_attacklogs(src, whodunnit, "got caught in an explosive blast[whodunnit ? " from" : ""]", addition = "Severity: [severity], Gibbed", admin_warn = msg_admin)
gib()
return
if (2.0)
adjustBruteLoss(60)
add_attacklogs(src, whodunnit, "got caught in an explosive blast from", addition = "Severity: [severity], Damage: 60", admin_warn = TRUE)
dmg_phrase = "Damage: 60"
if(3.0)
adjustBruteLoss(30)
add_attacklogs(src, whodunnit, "got caught in an explosive blast from", addition = "Severity: [severity], Damage: 30", admin_warn = TRUE)
dmg_phrase = "Damage: 30"
add_attacklogs(src, whodunnit, "got caught in an explosive blast[whodunnit ? " from" : ""]", addition = "Severity: [severity], [dmg_phrase]", admin_warn = msg_admin)
/mob/living/simple_animal/adjustBruteLoss(damage)