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

merry bottomas and a happy new queer #304

Merged
merged 3 commits into from
Dec 25, 2024
Merged

merry bottomas and a happy new queer #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
76dc45d
hold please
kittysmooch Dec 24, 2024
f6169cc
yep
kittysmooch Dec 24, 2024
99032e7
yeah thats pretty gay
kittysmooch Dec 24, 2024
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/~doppler_defines/sound.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@

#define SFX_BRICK_DROP "brick_drop"
#define SFX_BRICK_PICKUP "brick_pickup"
#define SFX_JINGLEBELL "jingle_bell"
4 changes: 4 additions & 0 deletions modular_doppler/modular_cosmetics/code/neck/collar.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,10 @@
greyscale_config_worn = /datum/greyscale_config/collar/bell/worn
greyscale_colors = "#222222#C0C0C0"

/obj/item/clothing/neck/human_petcollar/locked/bell/Initialize(mapload)
. = ..()
AddComponent(/datum/component/item_equipped_movement_rustle, SFX_JINGLEBELL)

/obj/item/clothing/neck/human_petcollar/locked/choker
name = "choker"
desc = "Quite fashionable... if you're somebody who's just read their first BDSM-themed erotica novel."
Expand Down
7 changes: 7 additions & 0 deletions modular_doppler/modular_sounds/code/sounds.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,12 @@
'modular_doppler/modular_sounds/sound/bricks/brick_pick_up_1.ogg',
'modular_doppler/modular_sounds/sound/bricks/brick_pick_up_2.ogg',
)
if(SFX_JINGLEBELL)
soundin = pick(
'sound/items/collarbell1.ogg',
'sound/items/collarbell2.ogg',
'sound/items/collarbell3.ogg',
'sound/items/collarbell4.ogg',
)

return soundin
12 changes: 12 additions & 0 deletions sound/items/attributions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,15 @@ glove_equip.ogg - LETHRCreak_Leather Belt Short Creak 01_PF_365 DAYS OF SOUND by
lead_pipe_hit.ogg - jixaw-metal-pipe-falling-sound.mp3 by thenotcheeseman -- https://freesound.org/s/679206/ -- License: Creative Commons 0
lead_pipe_drop.ogg - jixaw-metal-pipe-falling-sound.mp3 by thenotcheeseman -- https://freesound.org/s/679206/ -- License: Creative Commons 0
lead_pipe_pickup.ogg - Metal pipe hitting the ground.flac by CGEffex -- https://freesound.org/s/93962/ -- License: Attribution 4.0

- collarbell1.ogg (originally collarbell1.ogg)
- collarbell2.ogg (originally collarbell2.ogg)
license: published without license
Made by Kevak
source: https://github.com/Rotwood-Vale/Ratwood-Keep/pull/1910

- collarbell3.ogg (originally jesterstep1.ogg)
- collarbell4.ogg (originally jesterstep2.ogg)
license: "CC-BY-SA-3.0"
Made and posted by GentleJester#8754 on the SS14 discord.
source: https://discord.com/channels/310555209753690112/311537926376783886/1097222920813674527
Binary file added sound/items/collarbell1.ogg
View file
Open in desktop
Binary file not shown.
Binary file added sound/items/collarbell2.ogg
View file
Open in desktop
Binary file not shown.
Binary file added sound/items/collarbell3.ogg
View file
Open in desktop
Binary file not shown.
Binary file added sound/items/collarbell4.ogg
View file
Open in desktop
Binary file not shown.
Loading