Skip to content

Commit

Permalink
Merge pull request #963 from KnigTheThrasher/lightstep
Browse files Browse the repository at this point in the history
[PORT] Light Footed now makes stepping on glass Knockdown instead of Paralyze
  • Loading branch information
dwasint authored Jan 15, 2024
2 parents cb150dc + 9b0df3f commit af04568
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions code/datums/components/caltrop.dm
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,11 @@
return

var/picked_def_zone = pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
var/obj/item/bodypart/O = H.get_bodypart(picked_def_zone)
if(!istype(O))
var/obj/item/bodypart/leg = H.get_bodypart(picked_def_zone)
if(!istype(leg))
return

if(!IS_ORGANIC_LIMB(O))
if(!IS_ORGANIC_LIMB(leg))
return

if (!(flags & CALTROP_BYPASS_SHOES))
Expand All @@ -115,8 +115,10 @@
H.apply_damage(damage, BRUTE, picked_def_zone, wound_bonus = CANT_WOUND)

if(!(flags & CALTROP_NOSTUN)) // Won't set off the paralysis.
H.Paralyze(paralyze_duration)

if(!HAS_TRAIT(H, TRAIT_LIGHT_STEP))
H.Paralyze(paralyze_duration)
else
H.Knockdown(paralyze_duration)
if(!soundfile)
return
playsound(H, soundfile, 15, TRUE, -3)
Expand Down

0 comments on commit af04568

Please sign in to comment.