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

Merge conflicts and flags.

Browse Source
This commit is contained in:
ComicIronic
2015-01-20 22:34:26 +00:00
parent 54f206f23b 4c8ac69aff
commit 21c415ad17
345 changed files with 9886 additions and 8218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/ZAS/Airflow.dm
View File

@@ -248,7 +248,7 @@ proc/AirflowSpace(zone/A)
/atom/movable/proc/GotoAirflowDest(n)
last_airflow = world.time
if(airflow_dest == loc)
step_away(src,loc)
return
if(ismob(src))
if(src:status_flags & GODMODE)
return
@@ -365,21 +365,24 @@ proc/AirflowSpace(zone/A)
airflow_speed = 0
airflow_time = 0
. = ..()
sound_override = 0
atom/movable/proc/airflow_hit(atom/A)
airflow_speed = 0
airflow_dest = null
mob/airflow_hit(atom/A)
for(var/mob/M in hearers(src))
M.show_message("\red <B>\The [src] slams into \a [A]!</B>",1,"\red You hear a loud slam!",2)
if(!sound_override)
for(var/mob/M in hearers(src))
M.show_message("\red <B>\The [src] slams into \a [A]!</B>",1,"\red You hear a loud slam!",2)
//playsound(get_turf(src), "smash.ogg", 25, 1, -1)
weakened = max(weakened, (istype(A,/obj/item) ? A:w_class : rand(1,5))) //Heheheh
. = ..()
obj/airflow_hit(atom/A)
for(var/mob/M in hearers(src))
M.show_message("\red <B>\The [src] slams into \a [A]!</B>",1,"\red You hear a loud slam!",2)
if(!sound_override)
for(var/mob/M in hearers(src))
M.show_message("\red <B>\The [src] slams into \a [A]!</B>",1,"\red You hear a loud slam!",2)
//playsound(get_turf(src), "smash.ogg", 25, 1, -1)
. = ..()