shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6199 from Citadel-Station-13/upstream-merge-36783

Browse Source 
[MIRROR] Being buckled to an object means space wind wont pull you
This commit is contained in:
LetterJay
2018-03-31 19:03:31 -05:00
committed by GitHub
parent 38a1a0fca7 af24e78f5b
commit 212e82dece
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living.dm
+7 -5
View File
@@ -618,23 +618,25 @@
return pick("trails_1", "trails_2")
/mob/living/experience_pressure_difference(pressure_difference, direction, pressure_resistance_prob_delta = 0)
if (client && client.move_delay >= world.time + world.tick_lag*2)
if(buckled)
return
if(client && client.move_delay >= world.time + world.tick_lag*2)
pressure_resistance_prob_delta -= 30
var/list/turfs_to_check = list()
if (has_limbs)
if(has_limbs)
var/turf/T = get_step(src, angle2dir(dir2angle(direction)+90))
if (T)
turfs_to_check += T
T = get_step(src, angle2dir(dir2angle(direction)-90))
if (T)
if(T)
turfs_to_check += T
for (var/t in turfs_to_check)
for(var/t in turfs_to_check)
T = t
if (T.density)
if(T.density)
pressure_resistance_prob_delta -= 20
continue
for (var/atom/movable/AM in T)