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

Lizard Comedy is Now Legal on Shiptest #2369

Closed
wants to merge 4 commits into from
Closed

Lizard Comedy is Now Legal on Shiptest #2369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ebb8516
Add files via upload
Geoengi Sep 22, 2023
0cafdf8
Update emote.dm
Geoengi Sep 22, 2023
776f632
Update credits.txt
Geoengi Sep 22, 2023
f792a7e
Update credits.txt
Geoengi Sep 22, 2023
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
2 changes: 2 additions & 0 deletions code/modules/mob/living/emote.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,8 @@
return pick('sound/voice/human/manlaugh1.ogg', 'sound/voice/human/manlaugh2.ogg')
if(ismoth(H))
return 'sound/voice/moth/mothlaugh.ogg'
if(islizard(H))
return 'sound/voice/lizard/lizard_laugh.ogg'

/datum/emote/living/look
key = "look"
Expand Down
3 changes: 2 additions & 1 deletion sound/voice/lizard/credits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
lizard_scream_1 and lizard_scream_2 by n Beats. Lizard_scream_3 and lizard_scream_4 by -sihiL. Lizard_scream_4 edited Lord Saladin. PR and edits to 1,2 and 3 by super12pl.
deathsound.ogg is originally "demon dying.wav" by THE_bizniss. It was converted and compressed into .ogg format. It and a link to its license can be found at https://freesound.org/s/37823/
deathsound.ogg is originally "demon dying.wav" by THE_bizniss. It was converted and compressed into .ogg format. It and a link to its license can be found at https://freesound.org/s/37823/
lizard_laugh.ogg: audio created by YouTube user "Nagaty Studio" (https://youtu.be/I7CX0AS8RNI) licensed under CC by 3.0.
Binary file added sound/voice/lizard/lizard_laugh.ogg
View file
Open in desktop
Binary file not shown.