Skip to content

Commit

Permalink
snap back to reality
Browse files Browse the repository at this point in the history
  • Loading branch information
MrCastmer committed Jul 25, 2024
1 parent b87cf60 commit d7266e7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
7 changes: 2 additions & 5 deletions modular_dripstation/code/datums/component/tackle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -116,15 +116,12 @@
var/tackle_angle = get_angle(user, clicked_atom)
clicked_atom = get_turf_in_angle(tackle_angle, get_turf(user), min_distance)

userEffect(user, stamina_cost)
user.Knockdown(base_knockdown, ignore_canstun = TRUE)
user.adjustStaminaLoss(stamina_cost)
user.throw_at(clicked_atom, range, speed, user, FALSE)
addtimer(CALLBACK(src, PROC_REF(resetTackle)), base_knockdown, TIMER_STOPPABLE)
return(COMSIG_MOB_CANCEL_CLICKON)

/datum/component/tackler/proc/userEffect(mob/living/carbon/user, stamina_cost)
user.Knockdown(base_knockdown, ignore_canstun = TRUE)
user.adjustStaminaLoss(stamina_cost)

/**
* sack() is called when you actually smack into something, assuming we're mid-tackle. First it deals with smacking into non-carbons, in two cases:
* * If it's a non-carbon mob, we don't care, get out of here and do normal thrown-into-mob stuff
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@
return ..(user, TRUE)
.=..()

/* I swear to god, I hate you for this.
/mob/living/carbon/human/grabbedby(mob/living/carbon/user, supress_message = 0)
if(user == src && pulling && !pulling.anchored && grab_state >= GRAB_AGGRESSIVE && (HAS_TRAIT(src, TRAIT_FAT)) && ismonkey(pulling))
devour_mob(pulling)
else
.=..()
*/

0 comments on commit d7266e7

Please sign in to comment.