From f969f51379e96f8f3893b8b200b74a7b2607693f Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Fri, 20 Mar 2015 23:21:51 -0400 Subject: [PATCH] ZAS Tweaks --- code/ZAS/Airflow.dm | 12 ++++++------ code/game/turfs/simulated/walls.dm | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/ZAS/Airflow.dm b/code/ZAS/Airflow.dm index 0b153c75809..3646dda393f 100644 --- a/code/ZAS/Airflow.dm +++ b/code/ZAS/Airflow.dm @@ -13,8 +13,8 @@ mob/proc/airflow_stun() src << "You stay upright as the air rushes past you." return 0 if(!lying) - src << "The sudden rush of air knocks you over!" - Weaken(5) + src << "The sudden rush of air pushese you around!" +// Weaken(5) last_airflow_stun = world.time mob/living/silicon/airflow_stun() @@ -198,9 +198,9 @@ mob/airflow_hit(atom/A) for(var/mob/M in hearers(src)) M.show_message("\red \The [src] slams into \a [A]!",1,"\red You hear a loud slam!",2) playsound(src.loc, "smash.ogg", 25, 1, -1) - var/weak_amt = istype(A,/obj/item) ? A:w_class : rand(1,5) //Heheheh +/* var/weak_amt = istype(A,/obj/item) ? A:w_class : rand(1,5) //Heheheh Weaken(weak_amt) - . = ..() + . = ..() */ obj/airflow_hit(atom/A) for(var/mob/M in hearers(src)) @@ -230,12 +230,12 @@ mob/living/carbon/human/airflow_hit(atom/A) blocked = run_armor_check("groin","melee") apply_damage(b_loss/3, BRUTE, "groin", blocked, 0, "Airflow") - if(airflow_speed > 10) +/* if(airflow_speed > 10) Paralyse(round(airflow_speed * vsc.airflow_stun)) Stun(paralysis + 3) else Stun(round(airflow_speed * vsc.airflow_stun/2)) - . = ..() + . = ..() */ zone/proc/movables() . = list() diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index e9a59453030..8c5b9018c30 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -100,13 +100,13 @@ update_icon() return - +/* /turf/simulated/wall/adjacent_fire_act(turf/simulated/floor/adj_turf, datum/gas_mixture/adj_air, adj_temp, adj_volume) if(adj_temp > max_temperature) take_damage(rand(10, 20) * (adj_temp / max_temperature)) return ..() - +*/ /turf/simulated/wall/proc/dismantle_wall(devastated=0, explode=0) if(istype(src,/turf/simulated/wall/r_wall)) if(!devastated)