Skip to content

Commit

Permalink
чиним неправильные возвраты подскальзывания (TauCetiStation#12568)
Browse files Browse the repository at this point in the history
* slip callback fix

* cleanup
  • Loading branch information
NinjaPikachuska authored Dec 8, 2023
1 parent b52cc53 commit 818fe7f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 12 deletions.
7 changes: 1 addition & 6 deletions code/game/objects/effects/decals/Cleanable/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -233,15 +233,10 @@ var/global/list/toilet_overlay_cache = list()
if(G != src && G.type == type)
qdel(G)

/obj/effect/decal/cleanable/gourd/Crossed(atom/movable/AM)
. = ..()
try_faceplant_react(AM)

/obj/effect/decal/cleanable/gourd/proc/try_faceplant_react(atom/movable/AM)
if(!isliving(AM))
return
var/mob/living/L = AM
if(L.get_species() == UNATHI)
return
if(L.lying || L.crawling)
L.vomit()
L.vomit()
8 changes: 2 additions & 6 deletions code/modules/mob/mob_movement.dm
Original file line number Diff line number Diff line change
Expand Up @@ -381,17 +381,13 @@

/mob/proc/slip(weaken_duration, obj/slipped_on, lube)
SEND_SIGNAL(src, COMSIG_MOB_SLIP, weaken_duration, slipped_on, lube)
return FALSE
return TRUE

/mob/living/carbon/slip(weaken_duration, obj/slipped_on, lube)
if(!loc.handle_slip(src, weaken_duration, slipped_on, lube))
return FALSE

..()

/mob/living/carbon/slime/slip()
..()
return FALSE
return ..()

/mob/living/carbon/human/slip(weaken_duration, obj/slipped_on, lube)
if(species.flags[NO_SLIP])
Expand Down

0 comments on commit 818fe7f

Please sign in to comment.