cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improves existing projectile logging. Deflect/Reflect etc (#15281)

Browse Source 
Co-authored-by: joep van der velden <15887760+farie82@users.noreply.github.com>
This commit is contained in:
Farie82
2021-01-20 10:08:37 +00:00
committed by GitHub
co-authored by joep van der velden
parent 14e9e92508
commit 4224400ae7
3 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/projectile.dm
+7 -8
View File
@@ -148,19 +148,18 @@
L.visible_message("<span class='danger'>[L] is hit by \a [src][organ_hit_text]!</span>", \
"<span class='userdanger'>[L] is hit by \a [src][organ_hit_text]!</span>") //X has fired Y is now given by the guns so you cant tell who shot you if you could not see the shooter
var/reagent_note
var/has_reagents = FALSE
var/additional_log_text
if(blocked)
additional_log_text = " [blocked]% blocked"
if(reagents && reagents.reagent_list)
reagent_note = " REAGENTS:"
var/reagent_note = "REAGENTS:"
for(var/datum/reagent/R in reagents.reagent_list)
reagent_note += R.id + " ("
reagent_note += num2text(R.volume) + ") "
has_reagents = TRUE
additional_log_text = "[additional_log_text] (containing [reagent_note])"
if(!log_override && firer && !alwayslog)
if(has_reagents)
add_attack_logs(firer, L, "Shot with a [type] (containing [reagent_note])")
else
add_attack_logs(firer, L, "Shot with a [type]")
add_attack_logs(firer, L, "Shot with a [type][additional_log_text]")
return L.apply_effects(stun, weaken, paralyze, irradiate, slur, stutter, eyeblur, drowsy, blocked, stamina, jitter)
/obj/item/projectile/proc/get_splatter_blockage(var/turf/step_over, var/atom/target, var/splatter_dir, var/target_loca) //Check whether the place we want to splatter blood is blocked (i.e. by windows).