(SQ-Merge) Possible fix for drop-nomming (#3331)

* possible drop-nomming fix

* no longer 100% fall cushion on non-aligning prefs

* fixed some checks
This commit is contained in:
Heroman3003
2018-03-25 15:32:12 -04:00
committed by Aronai Sieyes
parent cce782335f
commit be17090547
2 changed files with 47 additions and 6 deletions
+5 -1
View File
@@ -415,7 +415,11 @@
user.visible_message(attempt_msg)
// Now give the prey time to escape... return if they did
var/swallow_time = delay || istype(prey, /mob/living/carbon/human) ? belly.human_prey_swallow_time : belly.nonhuman_prey_swallow_time
var/swallow_time
if(delay)
swallow_time = delay
else
swallow_time = istype(prey, /mob/living/carbon/human) ? belly.human_prey_swallow_time : belly.nonhuman_prey_swallow_time
//Timer and progress bar
if(!do_after(user, swallow_time, prey))