diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 96b66e26146..0369e33ad06 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -492,7 +492,7 @@ else if(helper.zone_selected == BODY_ZONE_PRECISE_MOUTH) nosound = TRUE playsound(src, 'modular_skyrat/modules/emotes/sound/emotes/Nose_boop.ogg', 50, 0) - if(HAS_TRAIT(src, TRAIT_SENSITIVESNOUT) && get_location_accessible(src, BODY_ZONE_PRECISE_MOUTH)) + if(HAS_TRAIT(src, TRAIT_SENSITIVESNOUT)) to_chat(src, span_warning("[helper] boops you on your sensitive nose, sending you to the ground!")) src.Knockdown(20) src.apply_damage(30, STAMINA) diff --git a/modular_skyrat/master_files/code/datums/traits/negative.dm b/modular_skyrat/master_files/code/datums/traits/negative.dm index 5b066c93821..11d7dfc9f45 100644 --- a/modular_skyrat/master_files/code/datums/traits/negative.dm +++ b/modular_skyrat/master_files/code/datums/traits/negative.dm @@ -65,3 +65,27 @@ value = -6 mob_trait = TRAIT_NOGUNS icon = "none" + +/datum/quirk/sensitivesnout + name = "Sensitive Snout" + desc = "Your snout has always been sensitive, and it really hurts when someone pokes it!" + gain_text = span_notice("Your snout is awfully sensitive.") + lose_text = span_notice("Your snout feels numb.") + medical_record_text = "Patient's snout seems to have a cluster of nerves in the tip, would advise against direct contact." + value = -2 + mob_trait = TRAIT_SENSITIVESNOUT + icon = "fingerprint" + +/datum/quirk/sensitivesnout/post_add() + quirk_holder.apply_status_effect(/datum/status_effect/sensitivesnout) + +/datum/quirk/sensitivesnout/remove() + quirk_holder.remove_status_effect(/datum/status_effect/sensitivesnout) + +/datum/status_effect/sensitivesnout + id = "sensitivesnout" + duration = -1 + alert_type = null + +/datum/status_effect/sensitivesnout/get_examine_text() + return span_warning("[owner.p_their(TRUE)] snout is rather bappable...") diff --git a/modular_skyrat/master_files/code/datums/traits/neutral.dm b/modular_skyrat/master_files/code/datums/traits/neutral.dm index 1828b27176f..300a3576fe6 100644 --- a/modular_skyrat/master_files/code/datums/traits/neutral.dm +++ b/modular_skyrat/master_files/code/datums/traits/neutral.dm @@ -191,12 +191,3 @@ var/obj/item/organ/internal/tongue/dog/new_tongue = new(get_turf(human_holder)) new_tongue.Insert(human_holder) -/datum/quirk/sensitivesnout - name = "Sensitive Snout" - desc = "Your face has always been sensitive, and it really hurts when someone pokes it!" - gain_text = span_notice("Your face is awfully sensitive.") - lose_text = span_notice("Your face feels numb.") - medical_record_text = "Patient's nose seems to have a cluster of nerves in the tip, would advise against direct contact." - value = 0 - mob_trait = TRAIT_SENSITIVESNOUT - icon = "fingerprint"