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.

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

add april fool: Toreador march for ambient && advanced slip #6365

Merged
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
2 changes: 1 addition & 1 deletion code/__DEFINES/sound.dm
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
#define SPACE_SOUNDS list('sound/ambience/ambispace.ogg', 'sound/ambience/ambispace2.ogg', 'sound/music/title2.ogg', 'sound/ambience/ambiatmos.ogg')

#define MAINTENANCE_SOUNDS list('sound/ambience/ambimaint1.ogg', 'sound/ambience/ambimaint2.ogg', 'sound/ambience/ambimaint3.ogg', 'sound/ambience/ambimaint4.ogg',\
'sound/ambience/ambimaint5.ogg', 'sound/voice/lowHiss2.ogg', 'sound/voice/lowHiss3.ogg', 'sound/voice/lowHiss4.ogg', 'sound/ambience/ambitech2.ogg' )
'sound/ambience/ambimaint5.ogg', 'sound/voice/lowHiss2.ogg', 'sound/voice/lowHiss3.ogg', 'sound/voice/lowHiss4.ogg', 'sound/ambience/ambitech2.ogg' ,'sound/music/freddys_har_har_har.ogg')

#define AWAY_MISSION_SOUNDS list('sound/ambience/ambitech.ogg', 'sound/ambience/ambitech2.ogg', 'sound/ambience/ambiruin.ogg',\
'sound/ambience/ambiruin2.ogg', 'sound/ambience/ambiruin3.ogg', 'sound/ambience/ambiruin4.ogg',\
Expand Down
13 changes: 12 additions & 1 deletion code/game/turfs/simulated.dm
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,18 @@
if(!(lube_flags & SLIDE_ICE))
// Ice slides are intended to be combo'd so don't give the feedback
to_chat(slipper, span_notice("You slipped[slippable ? " on the [slippable.name]" : ""]!"))
playsound(slipper.loc, 'sound/misc/slip.ogg', 50, TRUE, -3)
playsound(slipper.loc, pick( list('sound/misc/slip.ogg', 'sound/misc/slip_2.ogg') ), 50, TRUE, -3)
if(prob(50))
slipper.SpinAnimation(10, 1)
if(prob(10))
if(prob(50))
var/obj/item/organ/external/hand = slipper.get_organ(BODY_ZONE_PRECISE_L_HAND || BODY_ZONE_PRECISE_R_HAND)
if(!hand.has_fracture())
hand.fracture()
else
var/obj/item/organ/external/leg = slipper.get_organ(BODY_ZONE_L_LEG || BODY_ZONE_R_LEG)
if(!leg.has_fracture())
leg.fracture()

SEND_SIGNAL(slipper, COMSIG_ON_CARBON_SLIP)

Expand Down
Binary file added sound/misc/slip_2.ogg
BeebBeebBoob marked this conversation as resolved.
Show resolved Hide resolved
Binary file not shown.
Binary file added sound/music/freddys_har_har_har.ogg
BeebBeebBoob marked this conversation as resolved.
Show resolved Hide resolved
Binary file not shown.
Loading