cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-26 10:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13703 from Fox-McCloud/tg-flying-floating-float-refactor

Browse Source 
TG Flying+Floating Refactor
This commit is contained in:
AffectedArc07
2020-08-27 20:08:35 +01:00
committed by GitHub
parent fee73b96d5 ad05757a20
commit ebba3a322b
30 changed files with 61 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/datums/components/caltrop.dm
View File

@@ -42,7 +42,7 @@
if(!(flags & CALTROP_BYPASS_SHOES) && (H.shoes || feetCover))
return
if((H.flying) || H.buckled)
if(H.flying || H.floating || H.buckled)
return
var/damage = rand(min_damage, max_damage)

2
code/datums/components/slippery.dm
View File

@@ -51,6 +51,6 @@
Additionally calls the parent's `after_slip()` proc on the `victim`.
*/
/datum/component/slippery/proc/Slip(datum/source, mob/living/carbon/human/victim)
if(istype(victim) && prob(slip_chance) && victim.slip(description, stun, weaken, slip_tiles, walking_is_safe, slip_always, slip_verb))
if(istype(victim) && !victim.flying && prob(slip_chance) && victim.slip(description, stun, weaken, slip_tiles, walking_is_safe, slip_always, slip_verb))
var/atom/movable/owner = parent
owner.after_slip(victim)

8
code/datums/components/squeak.dm
View File

@@ -67,6 +67,14 @@
var/obj/item/projectile/P = AM
if(P.original != parent)
return
if(ismob(AM))
var/mob/M = AM
if(M.flying)
return
if(isliving(AM))
var/mob/living/L = M
if(L.floating)
return
var/atom/current_parent = parent
if(isturf(current_parent.loc))
play_squeak()