Merge pull request #26 from ARF-SS13/fenwork

More ambience, and dice rolling sounds

_maps/map_files/coyote_bayou/foxybar.dmm

@@ -130,6 +130,7 @@
 	plane = -2;
 	alpha = 175
 	},
+/obj/effect/sound_emitter/foxybar/windycurtains,
 /turf/open/floor/wood_fancy{
 	color = "#779999"
 	},
@@ -3014,6 +3015,7 @@
 /obj/effect/overlay/fog/fog2{
 	plane = 1
 	},
+/obj/effect/sound_emitter/foxybar/machinery,
 /turf/open/indestructible/ground/outside/sidewalk{
 	icon_state = "horizontalbottomborderbottom0"
 	},

_maps/map_files/coyote_bayou/foxybarupper.dmm

@@ -190,6 +190,18 @@
 	},
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/caves)
+"cO" = (
+/obj/structure/curtain{
+	color = "#c40e0e";
+	open = 0
+	},
+/obj/effect/fake_stairs/west{
+	color = "#845f58";
+	dir = 4
+	},
+/obj/effect/sound_emitter/foxybar/windycurtains,
+/turf/open/floor/carpet/black,
+/area/f13/fb/bar)
 "cQ" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 8;
@@ -1634,10 +1646,13 @@
 	plane = -2
 	},
 /obj/effect/decal/cleanable/glitter/white,
+/obj/effect/sound_emitter/foxybar/hottub,
+/obj/effect/fake_stairs/south{
+	alpha = 30
+	},
 /obj/effect/overlay/fog/fog2{
 	plane = -2
 	},
-/obj/effect/sound_emitter/foxybar/hottub,
 /turf/open/indestructible/ground/outside/water{
 	name = "hot spring";
 	color = "#90DBFE";
@@ -2013,6 +2028,10 @@
 /obj/effect/overlay/fog/fog2{
 	plane = -2
 	},
+/obj/structure/railing{
+	color = "#A47449";
+	dir = 8
+	},
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/caves)
 "xY" = (
@@ -3924,6 +3943,7 @@
 /obj/effect/turf_decal/siding/wood{
 	color = "#3B2B1A"
 	},
+/obj/effect/sound_emitter/foxybar/windycurtains,
 /turf/open/floor/carpet/black,
 /area/f13/fb/bar)
 "VG" = (
@@ -7667,11 +7687,11 @@ JX
 Vq
 il
 aH
-aH
+cO
 aH
 il
 aH
-aH
+cO
 aH
 il
 Ek

code/game/objects/effects/sound_emitter.dm

@@ -234,3 +234,25 @@
 		SOUND_LOOP_ENTRY('sound/machinery.ogg', 2.5 SECONDS, 1), //sound, how long it plays, weighted play 
 		)
 
+/obj/effect/sound_emitter/foxybar/windycurtains
+	name = "sound emitter (windycurtains)"
+	desc = "Sound emitter for some sort of noise."
+	icon = 'modular_coyote/icons/objects/c13ammo.dmi'
+	icon_state = "rock"
+	snd = /datum/looping_sound/soundrock/foxybar/windycurtains
+	synchronize = TRUE
+
+
+/datum/looping_sound/soundrock/foxybar/windycurtains
+	chance = 100 //% to play per time passing on the sound loop entry, in this case every 1 seconds.  If it doesn't get a true then it still uses the last played sounds time.
+	vary = FALSE //wink wonk versus wInK wOnK
+	extra_range = SOUND_DISTANCE(5) //flat out, this is 15 tiles from the sound rock itself
+	volume = SOUND_LOOP_VOL_RANGE(50, 60)
+	direct = FALSE 
+	managed = FALSE //true = sound dies when you leave the area, must be direct to use. 
+	loop_delay = 0
+	mid_sounds = list(
+		SOUND_LOOP_ENTRY('sound/windcurtains.ogg', 2.5 SECONDS, 1), //sound, how long it plays, weighted play 
+		)
+
+

code/game/objects/items/dice.dm

@@ -166,6 +166,7 @@
 			result = rigged
 	var/fake_result = roll(sides)//Daredevil isn't as good as he used to be
 	var/comment = ""
+	playsound(src, 'sound/effects/statroll.ogg', 100, TRUE, -1)
 	if(sides == 20 && result == 20)
 		comment = "NAT 20!"
 	else if(sides == 20 && result == 1)
@@ -214,11 +215,12 @@
 	if(!LAZYLEN(contents))
 		M.visible_message(
 			span_notice("[M] rattles [M.p_their()] empty dice cup! Pass the dice, please!"),
-			span_italic("I rattle your empty dice cup!"))
+			span_italic("I rattle my empty dice cup!"))
 		return
 	M.visible_message(
 		span_notice("[M] rattles [M.p_their()] dice cup! The dice inside clatter!"),
-		span_italic("I rattle your dice cup! The dice inside clatter!"))
+		span_italic("I rattle my dice cup! The dice inside clatter!"))
+	playsound(src, 'sound/effects/statroll.ogg', 100, TRUE, -1)
 
 /// actually rolls the dice and chunks them out on the table
 /// must be a table, but ya know
@@ -250,6 +252,7 @@
 		D.pixel_x = rand(-16, 16)
 		D.pixel_y = rand(-16, 16)
 	var/msg_out = span_green("[user] dumps the dice out of \the [src]! And here are the results...<br>")
+	playsound(src, 'sound/effects/statroll.ogg', 100, TRUE, -1)
 	msg_out += span_notice(output_messages.Join("<br>"))
 	user.visible_message(msg_out)
 	return TABLE_NO_PLACE