Emote Stuff (Courtesy of NithaIsTired) #3562

generalthrax · 2024-10-14T23:02:21Z

About The Pull Request

A really old emote pr made by @NithaIsTired that @rye-rice asked me to pr and finish. Adds stuff like:

visible trembling emote
visible shivering
audible snapping
booping lizard snouts
other stuff i dont remember
its a lot

Why It's Good For The Game

It's cute and cool.

Changelog

🆑 NithaIsTired
add: Adds a ton of audible emotes and visible emotes like snapping your fingers or twitching
add: You can boop people on the nose by clicking on their mouth with help intent
add: Sound variation with a few emotes like snapping and clapping
add: Laying down now plays a sound if you aren't on walk intent
/:cl:

This reverts commit d85dd11.

…into NithaIsTired-hugsandboops

code/modules/mob/living/living.dm

Signed-off-by: rye-rice <[email protected]>

thgvr

some things

thgvr · 2024-10-16T20:33:06Z

code/datums/mood_events/generic_positive_events.dm

 /datum/mood_event/warmhug
 	description = "<span class='nicegreen'>Warm cozy hugs are the best!</span>\n"
 	mood_change = 1
 	timeout = 2 MINUTES

+/datum/mood_event/tailpulled


I don't think this one is necessary

thgvr · 2024-10-16T20:33:09Z

code/datums/mood_events/generic_negative_events.dm

+	timeout = 2 MINUTES
+
+/datum/mood_event/rippedtail
+	description = "<span class='warning'>I ripped their tail right off, what have I done!</span>\n"


does span_warning() work in strings...? i don't know

if something expects its assignment to be static (i.e. defined as part of the object) macros don't work

span_warning() will work here.

Macros are part of the preprocessing step of the compiler and all they do is a simple "find and replace". What matters is what is in the macro.

#define span_warning(str) ("<span class='warning'>" + str + "</span>") is the macro definition. str in this case is a macro substitution and doesn't change at runtime, so the compiler will finalize the concatenation and the result will be a normal unassuming string.

If it were defined as #define span_warning(str) ("<span class='warning'>[str]</span>"), then it would fail where static assignments are required because [str] is an interpolated (non-static) runtime operator and that's illegal here.

thgvr · 2024-10-16T20:33:11Z

code/__DEFINES/dcs/signals/signals.dm

@@ -527,7 +527,8 @@
 #define COMSIG_CARBON_HUGGED "carbon_hugged"
 ///When a carbon mob is headpatted, this is called on the carbon that is headpatted. (mob/living/headpatter)
 #define COMSIG_CARBON_HEADPAT "carbon_headpatted"
-
+///When a carbon mob has their tail pulled, this is called on the carbon that is the target. (mob/living/tailpuller)
+#define COMSIG_CARBON_TAILPULL "carbon_tailpulled"


this isn't necessary either

thgvr · 2024-10-16T20:36:51Z

code/modules/mob/living/emote.dm

@@ -232,6 +232,16 @@
 	message = "jumps!"
 	hands_use_check = TRUE

+/datum/emote/living/jump/run_emote(mob/living/user, params, type_override, intentional)


This one's... I dunno. it's not actually jumping, and animated emotes like this rub me the wrong way a bit. Is the same one from tg?

i believe so? it's also fine as its just some extra flavor to an emote

ahem.
spinflipclapspinflipclap

Animated emotes are kinda. Meh. Especially since we have pixelshifting.

we kill people for spin flip clapping, again this is just extra flavor to the default emotes

The emote spam isn't really an issue for us. I'm just skeptical of emotes that move you like that in general.

thgvr · 2024-10-16T20:40:40Z

code/modules/mob/living/carbon/carbon_defense.dm

+// Tail pulls!
+	else if((M.zone_selected == BODY_ZONE_PRECISE_GROIN) && !isnull(src.getorgan(/obj/item/organ/tail)))
+		M.visible_message(span_notice("[M] pulls on [src]'s tail!"), \
+					null, span_hear("You hear a soft patter."), DEFAULT_MESSAGE_RANGE, list(M, src))


i'm scared to know what this means

thgvr · 2024-10-16T20:42:02Z

code/modules/mob/living/carbon/carbon_defense.dm

+
+	if(M.zone_selected == BODY_ZONE_PRECISE_MOUTH) // Nose boops!
+		nosound = TRUE
+		playsound(src, 'sound/effects/Nose_boop.ogg', 50, 0)


This sound is jarring and pretty out of place. I'd just cut it.

this is fine, trust me

I really do not agree

ill find another sound effect

thgvr · 2024-10-16T21:02:05Z

I should clarify the only parts I want changed are the boop sound, and the strange taill pull moodlet

generalthrax · 2024-10-16T21:22:23Z

I'll do it at my earliest convenience. I was already kinda of on the fence about the mood stuff and I've already got a new sound selected.

FalloutFalcon · 2024-10-17T20:20:36Z

Anticept · 2024-10-17T23:24:17Z

I could see the tail pull being used in an aggressive hostile way to piss someone off. Word it angrily in chat, throw a bad touch debuff, and a scream... Tail yank?

…into nithastuff

generalthrax · 2024-10-18T04:51:51Z

Should be up to standard. Unless there are further concerns.

tail pulling was REMOVED and the nose boop sound efefct was CHANGED we are so fucking back

lectronyx · 2024-10-18T20:06:11Z

WE LOVE SNAPPING
HELLLL YEAH

@NithaIsTired

## About The Pull Request A really old emote pr made by @NithaIsTired that @rye-rice asked me to pr and finish. Adds stuff like: > visible trembling emote > visible shivering > audible snapping > booping lizard snouts > other stuff i dont remember > its a lot ## Why It's Good For The Game It's cute and cool. ## Changelog :cl: NithaIsTired add: Adds a ton of audible emotes and visible emotes like snapping your fingers or twitching add: You can boop people on the nose by clicking on their mouth with help intent add: Sound variation with a few emotes like snapping and clapping add: Laying down now plays a sound if you aren't on walk intent /:cl: --------- Signed-off-by: rye-rice <[email protected]> Co-authored-by: Nitha <[email protected]> Co-authored-by: Nitha <[email protected]> Co-authored-by: rye-rice <[email protected]>

@NithaIsTired

A really old emote pr made by @NithaIsTired that @rye-rice asked me to pr and finish. Adds stuff like: > visible trembling emote > visible shivering > audible snapping > booping lizard snouts > other stuff i dont remember > its a lot It's cute and cool. :cl: NithaIsTired add: Adds a ton of audible emotes and visible emotes like snapping your fingers or twitching add: You can boop people on the nose by clicking on their mouth with help intent add: Sound variation with a few emotes like snapping and clapping add: Laying down now plays a sound if you aren't on walk intent /:cl: --------- Signed-off-by: rye-rice <[email protected]> Co-authored-by: Nitha <[email protected]> Co-authored-by: Nitha <[email protected]> Co-authored-by: rye-rice <[email protected]>

NithaIsTired and others added 22 commits September 17, 2023 19:46

adds bear hugs

4343306

adds a shake animation

cf97177

better defines the shake

0908b96

adds shiver/tremble animations

1c6b2f5

Adds nose boops. Boop!

b5ba197

adds tail pulls

d1706a8

argh, actually adds it

3e5088e

adds tail pulls / changes some text

3077a90

tail pulls part 2

35fb0c1

adds a falling sound to lying down

0589fc0

tail pulls part 2

508aa7a

gently laying down text

1ca42f3

more boops!

1339351

fixes the double falling sound

1978fde

more snaps and claps

60c3dec

okay getting back to this lets seee

d85dd11

Revert "okay getting back to this lets seee"

30c6c3b

This reverts commit d85dd11.

Merge branch 'shiptest-ss13:master' into hugsandboops

81ee802

Merge remote-tracking branch 'Shipz/master' into hugsandboops

79437d1

Merge remote-tracking branch 'origin/master' into hugsandboops

9c5fbc2

Merge branch 'hugsandboops' of https://github.com/NithaIsTired/Shipz …

4c0ff36

…into NithaIsTired-hugsandboops

Merge branch 'NithaIsTired-hugsandboops' into nithastuff

4e060ca

github-actions bot added Sound USSR Anthem 2.66 MB file. Code change Watch something violently break. labels Oct 14, 2024

generalthrax added 2 commits October 14, 2024 18:12

fix snap

8b23f1e

forreal

29755a9

generalthrax marked this pull request as ready for review October 14, 2024 23:26

generalthrax changed the title ~~Emote Stuff~~ Emote Stuff (Courtesy NithaIsTired) Oct 14, 2024

fixtwitch

991313c

generalthrax changed the title ~~Emote Stuff (Courtesy NithaIsTired)~~ Emote Stuff (Courtesy of NithaIsTired) Oct 14, 2024

rye-rice reviewed Oct 15, 2024

View reviewed changes

code/modules/mob/living/living.dm Outdated Show resolved Hide resolved

rye-rice and others added 2 commits October 15, 2024 00:00

Update code/modules/mob/living/living.dm

7b2481d

Signed-off-by: rye-rice <[email protected]>

Merge branch 'master' into nithastuff

0d2931e

rye-rice added this pull request to the merge queue Oct 16, 2024

thgvr previously requested changes Oct 16, 2024

View reviewed changes

rye-rice removed this pull request from the merge queue due to a manual request Oct 16, 2024

generalthrax added 3 commits October 17, 2024 23:43

tailpullgone

a1472bf

boop

3421a6e

Merge branch 'nithastuff' of https://github.com/generalthrax/Shiptest …

68c6e1d

…into nithastuff

whoops

77b5e46

rye-rice enabled auto-merge October 18, 2024 05:08

rye-rice added this pull request to the merge queue Oct 18, 2024

Merged via the queue into shiptest-ss13:master with commit 50566a1 Oct 18, 2024
14 checks passed

shiptest-server pushed a commit that referenced this pull request Oct 18, 2024

Automatic changelog generation for PR #3562 [ci skip]

4b47a6c

zimon9 pushed a commit to zimon9/Shiptest-PR-testing that referenced this pull request Oct 29, 2024

Automatic changelog generation for PR shiptest-ss13#3562 [ci skip]

d730e6c

Constellado mentioned this pull request Dec 15, 2024

[MDB IGNORE] [IDB IGNORE] Cherrypickening 3: MegaSuper Without Guns [IDB IGNORE] [MDB IGNORE] PentestSS13/Pentest#71

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Emote Stuff (Courtesy of NithaIsTired) #3562

Emote Stuff (Courtesy of NithaIsTired) #3562

generalthrax commented Oct 14, 2024 •

edited by rye-rice

Loading

thgvr left a comment

thgvr Oct 16, 2024

thgvr Oct 16, 2024

Erikafox Oct 16, 2024

Anticept Oct 16, 2024 •

edited

Loading

thgvr Oct 16, 2024

thgvr Oct 16, 2024

rye-rice Oct 16, 2024

Erikafox Oct 16, 2024

rye-rice Oct 16, 2024

thgvr Oct 16, 2024

thgvr Oct 16, 2024

thgvr Oct 16, 2024

rye-rice Oct 16, 2024

thgvr Oct 16, 2024

rye-rice Oct 16, 2024

thgvr commented Oct 16, 2024

generalthrax commented Oct 16, 2024

FalloutFalcon commented Oct 17, 2024

Anticept commented Oct 17, 2024 •

edited

Loading

generalthrax commented Oct 18, 2024

lectronyx commented Oct 18, 2024

Emote Stuff (Courtesy of NithaIsTired) #3562

Emote Stuff (Courtesy of NithaIsTired) #3562

Conversation

generalthrax commented Oct 14, 2024 • edited by rye-rice Loading

About The Pull Request

Why It's Good For The Game

Changelog

thgvr left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Anticept Oct 16, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

thgvr commented Oct 16, 2024

generalthrax commented Oct 16, 2024

FalloutFalcon commented Oct 17, 2024

Anticept commented Oct 17, 2024 • edited Loading

generalthrax commented Oct 18, 2024

lectronyx commented Oct 18, 2024

generalthrax commented Oct 14, 2024 •

edited by rye-rice

Loading

Anticept Oct 16, 2024 •

edited

Loading

Anticept commented Oct 17, 2024 •

edited

Loading