Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] non-con headpats begone #1182

Merged
merged 1 commit into from
Dec 18, 2023
Merged

[MIRROR] non-con headpats begone #1182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/__DEFINES/~skyrat_defines/traits/declarations.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_OXYIMMUNE "oxyimmune" // Immune to oxygen damage, ideally give this to all non-breathing species or bad stuff will happen
#define TRAIT_AFFECTION_AVERSION "affection_aversion" // No more dogborg licking. "Dogborg bad" is no longer a personality
#define TRAIT_PERSONALSPACE "personalspace" // Block/counter-attack ass-slaps
#define TRAIT_QUICKREFLEXES "quickreflexes" // Counters hugs and headpats
#define TRAIT_MOOD_NOEXAMINE "mood_noexamine" // Can't assess your own mood
#define TRAIT_DNR "do_not_revive" // Can't be revived without supernatural means or admin intervention
#define TRAIT_HARD_SOLES "hard_soles" // No step on glass
Expand Down
1 change: 1 addition & 0 deletions code/_globalvars/traits/_traits.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,6 +612,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_OVERSIZED" = TRAIT_OVERSIZED,
"TRAIT_OXYIMMUNE" = TRAIT_OXYIMMUNE,
"TRAIT_PERSONALSPACE" = TRAIT_PERSONALSPACE,
"TRAIT_QUICKREFLEXES" = TRAIT_QUICKREFLEXES,
"TRAIT_PET_OWNER" = TRAIT_PET_OWNER,
"TRAIT_R_UNIQUEWRECK" = TRAIT_R_UNIQUEWRECK,
"TRAIT_R_UNIQUETIP" = TRAIT_R_UNIQUETIP,
Expand Down
1 change: 1 addition & 0 deletions code/_globalvars/traits/admin_tooling.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
"TRAIT_OVERSIZED" = TRAIT_OVERSIZED,
"TRAIT_OXYIMMUNE" = TRAIT_OXYIMMUNE,
"TRAIT_PERSONALSPACE" = TRAIT_PERSONALSPACE,
"TRAIT_QUICKREFLEXES" = TRAIT_QUICKREFLEXES,
"TRAIT_PET_OWNER" = TRAIT_PET_OWNER,
"TRAIT_R_UNIQUEWRECK" = TRAIT_R_UNIQUEWRECK,
"TRAIT_R_UNIQUETIP" = TRAIT_R_UNIQUETIP,
Expand Down
26 changes: 19 additions & 7 deletions code/modules/mob/living/carbon/carbon_defense.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,18 +486,25 @@
//SKYRAT EDIT ADDITION BEGIN - EMOTES -- SENSITIVE SNOUT TRAIT ADDITION
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))
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)
helper.visible_message(span_notice("[helper] boops [src]'s nose."), span_notice("You boop [src] on the nose."))
if(HAS_TRAIT(src, TRAIT_QUICKREFLEXES) && (src.stat != UNCONSCIOUS) && src.incapacitated(IGNORE_RESTRAINTS))
visible_message(span_warning("[helper] tries to boop [src] on the nose, but [p_they()] move[p_s()] out of the way."))
return
else
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))
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)
helper.visible_message(span_notice("[helper] boops [src]'s nose."), span_notice("You boop [src] on the nose."))
//SKYRAT EDIT ADDITION END
else if(check_zone(helper.zone_selected) == BODY_ZONE_HEAD && get_bodypart(BODY_ZONE_HEAD)) //Headpats!
//SKYRAT EDIT ADDITION BEGIN - OVERSIZED HEADPATS
//SKYRAT EDIT ADDITION BEGIN - OVERSIZED & DISALLOWED HEADPATS
if(HAS_TRAIT(src, TRAIT_OVERSIZED) && !HAS_TRAIT(helper, TRAIT_OVERSIZED))
visible_message(span_warning("[helper] tries to pat [src] on the head, but can't reach!"))
return
else if(HAS_TRAIT(src, TRAIT_QUICKREFLEXES) && (src.stat != UNCONSCIOUS) && !src.incapacitated(IGNORE_RESTRAINTS))
visible_message(span_warning("[helper] tries to pat [src] on the head, but [p_they()] move[p_s()] out of the way."))
return
//SKYRAT EDIT ADDITION END
helper.visible_message(span_notice("[helper] gives [src] a pat on the head to make [p_them()] feel better!"), \
null, span_hear("You hear a soft patter."), DEFAULT_MESSAGE_RANGE, list(helper, src))
Expand Down Expand Up @@ -541,6 +548,11 @@
to_chat(helper, span_notice("You wrap [src] into a tight bear hug!"))
to_chat(src, span_notice("[helper] squeezes you super tightly in a firm bear hug!"))
else
// SKYRAT EDIT ADDITION START
if (HAS_TRAIT(src, TRAIT_QUICKREFLEXES) && (src.stat != UNCONSCIOUS) && !src.incapacitated(IGNORE_RESTRAINTS))
visible_message(span_warning("[helper] tries to hug [src], but [p_they()] move[p_s()] out of the way."))
return
// SKYRAT EDIT ADDITION END
helper.visible_message(span_notice("[helper] hugs [src] to make [p_them()] feel better!"), \
null, span_hear("You hear the rustling of clothes."), DEFAULT_MESSAGE_RANGE, list(helper, src))
to_chat(helper, span_notice("You hug [src] to make [p_them()] feel better!"))
Expand Down
6 changes: 5 additions & 1 deletion code/modules/mob/living/silicon/silicon_defense.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,11 @@
visible_message(span_danger("[user] punches [src], but doesn't leave a dent!"), \
span_warning("[user] punches you, but doesn't leave a dent!"), null, COMBAT_MESSAGE_RANGE, user)
to_chat(user, span_danger("You punch [src], but don't leave a dent!"))
else
else // SKYRAT EDIT ADDITION START
if(HAS_TRAIT(src, TRAIT_QUICKREFLEXES) && (src.stat != UNCONSCIOUS) && !src.incapacitated(IGNORE_RESTRAINTS))
visible_message(span_warning("[user] tries to pet [src], but it moves out of the way."))
return
// SKYRAT EDIT ADDITION END
visible_message(span_notice("[user] pets [src]."), \
span_notice("[user] pets you."), null, null, user)
to_chat(user, span_notice("You pet [src]."))
Expand Down
22 changes: 22 additions & 0 deletions modular_skyrat/modules/modular_items/lewd_items/code/verbs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,28 @@
else
to_chat(src, span_warning("You can't cum right now!"))

/mob/living/verb/reflexes_verb()
set name = "Toggle Reflexes"
set category = "IC"
if(!HAS_TRAIT_FROM(src, TRAIT_QUICKREFLEXES, REF(src)))
ADD_TRAIT(src, TRAIT_QUICKREFLEXES, REF(src))
to_chat(src, span_notice("[get_reflexes_gain_text()]"))
else
REMOVE_TRAIT(src, TRAIT_QUICKREFLEXES, REF(src))
to_chat(src, span_notice("[get_reflexes_lose_text()]"))

/mob/living/proc/get_reflexes_gain_text()
return "You don't feel like being touched right now."

/mob/living/proc/get_reflexes_lose_text()
return "You'll allow yourself to be touched now."

/mob/living/silicon/get_reflexes_gain_text()
return "Our systems will disallow platonic contact."

/mob/living/silicon/get_reflexes_lose_text()
return "Our systems will allow platonic contact."

/mob/living/carbon/human/Initialize(mapload)
. = ..()
if(CONFIG_GET(flag/disable_erp_preferences))
Expand Down
Loading