cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-10 01:57:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ice sliding related fixes. (#40415)

Browse Source 
* Ice sliding related fixes.

* Makes ICE do not break other forced movement.

* Revert "Makes ICE do not break other forced movement."

This reverts commit 2aa691d3b8b35c31101e86fd888417755da86dcd.
This commit is contained in:
AnturK
2018-09-24 12:18:51 +02:00
committed by vuonojenmustaturska
parent e6182966cb
commit 72f5c3a831
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/datums/forced_movement.dm
View File

@@ -51,6 +51,9 @@
last_processed = world.time last_processed = world.time
/datum/forced_movement/proc/TryMove(recursive = FALSE) /datum/forced_movement/proc/TryMove(recursive = FALSE)
if(QDELETED(src)) //Our previous step caused deletion of this datum
return
var/atom/movable/vic = victim //sanic var/atom/movable/vic = victim //sanic
var/atom/tar = target var/atom/tar = target

3
code/game/turfs/open.dm
View File

@@ -231,6 +231,7 @@
C.accident(I) C.accident(I)
var/olddir = C.dir var/olddir = C.dir
C.moving_diagonally = 0 //If this was part of diagonal move slipping will stop it.
if(!(lube & SLIDE_ICE)) if(!(lube & SLIDE_ICE))
C.Knockdown(knockdown_amount) C.Knockdown(knockdown_amount)
C.stop_pulling() C.stop_pulling()
@@ -244,6 +245,8 @@
if(lube&SLIDE) if(lube&SLIDE)
new /datum/forced_movement(C, get_ranged_target_turf(C, olddir, 4), 1, FALSE, CALLBACK(C, /mob/living/carbon/.proc/spin, 1, 1)) new /datum/forced_movement(C, get_ranged_target_turf(C, olddir, 4), 1, FALSE, CALLBACK(C, /mob/living/carbon/.proc/spin, 1, 1))
else if(lube&SLIDE_ICE) else if(lube&SLIDE_ICE)
if(C.force_moving) //If we're already slipping extend it
qdel(C.force_moving)
new /datum/forced_movement(C, get_ranged_target_turf(C, olddir, 1), 1, FALSE) //spinning would be bad for ice, fucks up the next dir new /datum/forced_movement(C, get_ranged_target_turf(C, olddir, 1), 1, FALSE) //spinning would be bad for ice, fucks up the next dir
return 1 return 1