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

Edited proc arguments.

Browse Source
This commit is contained in:
ComicIronic
2014-10-31 21:33:36 +00:00
parent 4b625302e3
commit abf976d91a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/ZAS/Airflow.dm
View File

@@ -396,13 +396,13 @@ mob/living/carbon/human/airflow_hit(atom/A)
var/b_loss = airflow_speed * zas_settings.Get(/datum/ZAS_Setting/airflow_damage) var/b_loss = airflow_speed * zas_settings.Get(/datum/ZAS_Setting/airflow_damage)
var/blocked = run_armor_check("head","melee") var/blocked = run_armor_check("head","melee")
apply_damage(b_loss/3, BRUTE, "head", blocked, 0, "Airflow") apply_damage(b_loss/3, BRUTE, "head", blocked, 0, used_weapon = "Airflow")
blocked = run_armor_check("chest","melee") blocked = run_armor_check("chest","melee")
apply_damage(b_loss/3, BRUTE, "chest", blocked, 0, "Airflow") apply_damage(b_loss/3, BRUTE, "chest", blocked, 0, used_weapon = "Airflow")
blocked = run_armor_check("groin","melee") blocked = run_armor_check("groin","melee")
apply_damage(b_loss/3, BRUTE, "groin", blocked, 0, "Airflow") apply_damage(b_loss/3, BRUTE, "groin", blocked, 0, used_weapon = "Airflow")
if(zas_settings.Get(/datum/ZAS_Setting/airflow_push) || AirflowCanPush()) if(zas_settings.Get(/datum/ZAS_Setting/airflow_push) || AirflowCanPush())
if(airflow_speed > 10) if(airflow_speed > 10)

2
code/modules/mob/living/living_defense.dm
View File

@@ -57,7 +57,7 @@
P.on_hit(src,2) P.on_hit(src,2)
return 2 return 2
if(!P.nodamage) if(!P.nodamage)
apply_damage((P.damage/(absorb+1)), P.damage_type, def_zone, absorb, 0, P) apply_damage((P.damage/(absorb+1)), P.damage_type, def_zone, absorb, 0, used_weapon = P)
P.on_hit(src, absorb) P.on_hit(src, absorb)
if(istype(P, /obj/item/projectile/beam/lightning)) if(istype(P, /obj/item/projectile/beam/lightning))
if(P.damage >= 200) if(P.damage >= 200)