Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions code/__DEFINES/dcs/signals/signals_mob/signals_mob_carbon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,10 @@
#define COMSIG_HUMAN_BURNING "human_burning"
///from /mob/living/carbon/human/proc/force_say(): ()
#define COMSIG_HUMAN_FORCESAY "human_forcesay"
///from /datum/interaction/proc/act(), sent to the mob who performed the interaction: (interaction, target, zone)
#define COMSIG_HUMAN_INTERACTION_PERFORMED "human_interaction_performed"
///from /datum/interaction/proc/act(), sent to the mob the interaction was performed on: (interaction, user, zone)
#define COMSIG_HUMAN_INTERACTION_RECEIVED "human_interaction_received"

///from /mob/living/carbon/human/get_visible_name(), not sent if the mob has TRAIT_UNKNOWN: (identity)
#define COMSIG_HUMAN_GET_VISIBLE_NAME "human_get_visible_name"
Expand Down
2 changes: 2 additions & 0 deletions code/__DEFINES/~~zzmeta_defines/traits.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/// Blocks audible emote sounds (e.g. laugh) without blocking speech, unlike TRAIT_MUTE
#define TRAIT_MUFFLED_EMOTE_SOUND "muffled_emote_sound"
4 changes: 4 additions & 0 deletions code/datums/emotes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,10 @@
if(emote_type & EMOTE_AUDIBLE && !hands_use_check)
if(HAS_TRAIT(user, TRAIT_MUTE))
return FALSE
// META EDIT ADDITION START
if(HAS_TRAIT(user, TRAIT_MUFFLED_EMOTE_SOUND))
return FALSE
// META EDIT ADDITION END
if(ishuman(user))
var/mob/living/carbon/human/loud_mouth = user
if(HAS_MIND_TRAIT(loud_mouth, TRAIT_MIMING)) // vow of silence prevents outloud noises
Expand Down
11 changes: 11 additions & 0 deletions config/interactions/beckon.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"name": "Beckon",
"description": "Beckon someone over to you.",
"usage": "other",
"category": "Miscellaneous",
"distance_allowed": 1,
"message": ["%USER% beckons %TARGET% over to them."],
"sound_possible": [],
"sound_range": 7,
"interaction_requires": ["self_hand"]
}
18 changes: 18 additions & 0 deletions config/interactions/cheer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"name": "Cheer",
"description" : "Cheer for them! You go buddy!",
"usage": "both",
"category": "Miscellaneous",
"distance_allowed": 1,
"message": [
"%USER% cheers for %TARGET%!"
],
"zone_overrides": {
"_self": {
"message": ["%USER% cheers for themselves!"],
"self_messages": [
"<span class='purple'>You cheer for yourself! You go buddy!</span>"
]
}
}
}
131 changes: 131 additions & 0 deletions config/interactions/example_interaction.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
{
"name": "interaction name",
"description": "interaction description",
"usage": "usage",
"category": "hide",
"distance_allowed": 0,
"cooldown": 5,
"message": [
"%USER% pokes %TARGET%!"
],
"self_messages": [
"You poke yourself!"
],
"zone_overrides": {
"head": {
"message": [
"%USER% pokes %TARGET% in the head!"
],
"user_messages": [
"You poke %TARGET% in the head!"
],
"target_messages": [
"%USER% pokes you in the head!"
],
"target_status_effects": [
{
"type": "/datum/status_effect/dizziness",
"duration": 3,
"chance": 50
}
]
},
"l_arm": {
"message": [
"%USER% pokes %TARGET%'s arm!"
],
"decals": [
{
"type": "/obj/effect/decal/cleanable/glitter",
"spawn_on": "user",
"color": "#ff69b4",
"chance": 25
}
]
},
"r_arm": {
"message": [
"%USER% pokes %TARGET%'s arm!"
]
},
"mouth": {
"message": [
"%USER% pokes %TARGET% on the lips!"
],
"target_force_say_phrases": [
"mmph!",
"shh!"
],
"target_force_say_chance": 30,
"target_status_effects": [
{
"type": "/datum/status_effect/example",
"duration": 60,
"chance": 100,
"tether": true
}
],
"sound_possible": [
"soundpath_smooch"
]
},
"_self": {
"message": [
"%USER% pokes themselves for no reason!"
],
"self_messages": [
"You poke yourself. Why?"
]
},
"_combat": {
"message": [
"%USER% jabs a finger hard into %TARGET%!"
]
},
"_prone": {
"message": [
"%USER% pokes %TARGET% while they're on the ground!"
]
},
"_bothprone": {
"message": [
"%USER% pokes %TARGET% while they're both on the ground!"
]
}
},
"sound_possible": [
"soundpath1",
"soundpath2"
],
"sound_range": 7,
"interaction_requires": [
"self_hand",
"target_hand"
],
"color": "blue",
"user_messages": [
"You poke %TARGET%!"
],
"user_required_parts": [],
"user_arousal": 0,
"user_pleasure": 0,
"user_pain": 0,
"user_bleed": 0,
"user_force_say_phrases": [],
"user_force_say_chance": 100,
"user_status_effects": [],
"target_messages": [
"%USER% pokes you!"
],
"target_required_parts": [],
"target_arousal": 0,
"target_pleasure": 0,
"target_pain": 0,
"target_bleed": 0,
"target_force_say_phrases": [],
"target_force_say_chance": 100,
"target_status_effects": [],
"decals": [],
"lewd": 0,
"sexuality": ""
}
10 changes: 10 additions & 0 deletions config/interactions/fistbump.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"name": "Fistbump",
"description": "A handshake without the shake.",
"usage": "other",
"category": "Miscellaneous",
"distance_allowed": 0,
"message": ["%USER% bumps %TARGET%'s fist with theirs!"],
"interaction_requires": ["self_hand", "target_hand"],
"sound_possible": ["sound/effects/hit_punch.ogg"]
}
12 changes: 12 additions & 0 deletions config/interactions/handshake.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"name": "Handshake",
"description": "Shake hands with them. Savvy.",
"usage": "other",
"category": "Miscellaneous",
"distance_allowed": 0,
"message": ["%USER% shakes %TARGET%'s hand."],
"interaction_requires": ["self_hand", "target_hand"],
"sound_possible": [
"sound/items/weapons/thudswoosh.ogg"
]
}
14 changes: 14 additions & 0 deletions config/interactions/highfive.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "Highfive",
"description": "Gimme some!",
"usage": "other",
"category": "Miscellaneous",
"distance_allowed": 0,
"message": ["%USER% gives %TARGET% a highfive!"],
"interaction_requires": ["self_hand", "target_hand"],
"sound_range": 5,
"sound_possible": [
"modular_zubbers/sound/emotes/claponce1.ogg",
"modular_zubbers/sound/emotes/claponce2.ogg"
]
}
35 changes: 35 additions & 0 deletions config/interactions/pat.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"name": "Pat",
"description": "Pat their shoulder, or their head if you're aiming there.",
"usage": "both",
"category": "Miscellaneous",
"distance_allowed": 0,
"message": ["%USER% pats %TARGET% on their shoulder."],
"interaction_requires": ["self_hand"],
"sound_range": 3,
"sound_possible": [
"sound/effects/rustle/rustle1.ogg",
"sound/effects/rustle/rustle2.ogg",
"sound/effects/rustle/rustle3.ogg",
"sound/effects/rustle/rustle4.ogg",
"sound/effects/rustle/rustle5.ogg"
],
"zone_overrides": {
"head": {
"message": ["%USER% pats %TARGET%'s head!"],
"sound_possible": ["sound/items/weapons/thudswoosh.ogg"]
},
"_self": {
"message": ["%USER% pats their own shoulder."],
"self_messages": [
"<span class='purple'>You pat your own shoulder, comforting yourself.</span>"
]
},
"head_self": {
"message": ["%USER% pats their own head!"],
"self_messages": [
"<span class='purple'>You pat your own head.</span>"
]
}
}
}
11 changes: 11 additions & 0 deletions config/interactions/salute.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"name": "Salute",
"description": "Snap to a salute, perhaps to show respect for the Captain.",
"usage": "self",
"category": "Miscellaneous",
"distance_allowed": 1,
"message": ["%USER% snaps to a salute!"],
"sound_possible": ["sound/mobs/humanoids/human/salute/salute.ogg"],
"sound_range": 5,
"interaction_requires": ["self_hand"]
}
17 changes: 0 additions & 17 deletions config/skyrat/interactions/beckon.json

This file was deleted.

14 changes: 0 additions & 14 deletions config/skyrat/interactions/cheer.json

This file was deleted.

21 changes: 0 additions & 21 deletions config/skyrat/interactions/example_interaction.json

This file was deleted.

18 changes: 0 additions & 18 deletions config/skyrat/interactions/fistbump.json

This file was deleted.

18 changes: 0 additions & 18 deletions config/skyrat/interactions/handshake.json

This file was deleted.

17 changes: 0 additions & 17 deletions config/skyrat/interactions/headpat.json

This file was deleted.

Loading
Loading