Skip to content

Commit

Permalink
Wire Monkey + Pierce Immune Trait Fixes (#178)
Browse files Browse the repository at this point in the history
  • Loading branch information
Aurrain authored Jun 4, 2024
1 parent 27ce1ba commit 47d082d
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 3 deletions.
1 change: 1 addition & 0 deletions code/__DEFINES/traits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@
#define TRAIT_STEELFIST "steel_fist"
#define TRAIT_NOODLEFIST "noodle_fist"
#define TRAIT_POWER_ARMOR "power_armor"
#define TRAIT_BARBEDWIRENODMG "wire_monkey" //Ook dook.
#define TRAIT_SNOB "snob"
#define TRAIT_CULT_EYES "cult_eyes"
#define TRAIT_AUTO_CATCH_ITEM "auto_catch_item"
Expand Down
13 changes: 11 additions & 2 deletions code/datums/components/caltrop.dm
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,15 @@
if(HAS_TRAIT(H, TRAIT_PIERCEIMMUNE))
return

if(HAS_TRAIT(H, TRAIT_BARBEDWIRENODMG) && (flags & CALTROP_BYPASS_SHOES))
H.Paralyze(30)
H.visible_message(
span_danger("[H] trips into [parent] without receiving a cut."),
span_userdanger("You trip into [parent], narrowly avoiding getting cut!"))

return


if((flags & CALTROP_IGNORE_WALKERS) && H.m_intent == MOVE_INTENT_WALK)
return

Expand Down Expand Up @@ -104,8 +113,8 @@
if(!(flags & CALTROP_SILENT) && !H.has_status_effect(/datum/status_effect/caltropped))
H.apply_status_effect(/datum/status_effect/caltropped)
H.visible_message(
span_danger("[H] steps on [parent]."),
span_userdanger("You step on [parent]!")
span_danger("[H] steps on [parent] like a dipshit."),
span_userdanger("You step on [parent] like a moron!")
)

INVOKE_ASYNC(H, TYPE_PROC_REF(/mob/living/carbon/human, apply_damage), damage, BRUTE, picked_def_zone, FALSE, FALSE, FALSE, CANT_WOUND)
Expand Down
11 changes: 10 additions & 1 deletion code/datums/traits/good.dm
Original file line number Diff line number Diff line change
Expand Up @@ -923,7 +923,6 @@ GLOBAL_LIST_INIT(bone_dancer_recipes, list(
gain_text = span_notice("Your need for food has left you.")
lose_text = span_danger("GOD YOU WANT A BURGER SO BAD.")
locked = FALSE
*/
/datum/quirk/thickskin
name = "Thick Skin"
Expand All @@ -933,6 +932,16 @@ GLOBAL_LIST_INIT(bone_dancer_recipes, list(
gain_text = span_notice("Your skin feels way stronger.")
lose_text = span_danger("You feel like your skin is about as tough as tissue paper.")
locked = TRUE
*/

/datum/quirk/barbedwire
name = "Wire Monkey"
desc = "You know how to walk through barbed wire without pain, halves the stun too."
value = 2
mob_trait = TRAIT_BARBEDWIRENODMG
gain_text = span_notice("You feel at home in the trenches.")
lose_text = span_danger("The thought of barbed wire horrifies you.")
locked = FALSE

/datum/quirk/quickercarry
name = "Quicker Carry"
Expand Down

0 comments on commit 47d082d

Please sign in to comment.