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

[MIRROR] Reverts intercept_user_move change for flightsuits (#5630)

Browse Source 
* Merge pull request #35830 from vuonojenmustaturska/clientsignal

Reverts intercept_user_move change for flightsuits

* Reverts intercept_user_move change for flightsuits
This commit is contained in:
CitadelStationBot
2018-02-21 09:28:53 -06:00
committed by Poojawa
parent fe8b463203
commit af2ae3d727
3 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
code/modules/clothing/spacesuits/flightsuit.dm
View File

@@ -253,22 +253,26 @@
afterForceMove = FALSE
if(flight)
ion_trail.generate_effect()
var/momentum_increment = momentum_gain
if(boost)
momentum_increment = boost_power
if(brake)
momentum_increment = 0
if(!gravity && !pressure)
momentum_increment -= 10
switch(dir)
if(NORTH)
adjust_momentum(0, momentum_increment)
if(SOUTH)
adjust_momentum(0, -momentum_increment)
if(EAST)
adjust_momentum(momentum_increment, 0)
if(WEST)
adjust_momentum(-momentum_increment, 0)
/obj/item/device/flightpack/intercept_user_move(dir, mob, newLoc, oldLoc)
if(!flight)
return
var/momentum_increment = momentum_gain
if(boost)
momentum_increment = boost_power
if(brake)
momentum_increment = 0
if(!gravity && !pressure)
momentum_increment -= 10
switch(dir)
if(NORTH)
adjust_momentum(0, momentum_increment)
if(SOUTH)
adjust_momentum(0, -momentum_increment)
if(EAST)
adjust_momentum(momentum_increment, 0)
if(WEST)
adjust_momentum(-momentum_increment, 0)
//Make the wearer lose some momentum.
/obj/item/device/flightpack/proc/momentum_decay()

3
code/modules/mob/mob_movement.dm
View File

@@ -111,6 +111,9 @@
if(mob.throwing)
mob.throwing.finalize(FALSE)
for(var/obj/O in mob.user_movement_hooks)
O.intercept_user_move(direct, mob, n, oldloc)
var/atom/movable/P = mob.pulling
if(P && !ismob(P) && P.density)
mob.dir = turn(mob.dir, 180)