Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13 int…

…o sharps

code/__DEFINES/sounds.dm

@@ -1,6 +1,6 @@
 #define FALLOFF_SOUNDS 1
 
-#define FREE_CHAN_END 1016
+#define FREE_CHAN_END 1014
 #define INITIAL_SOUNDSCAPE_COOLDOWN 20
 
 #define EAR_DEAF_MUTE 1
@@ -21,6 +21,7 @@
 #define ITEM_EQUIP_VOLUME 50
 
 //Reserved channels
+#define SOUND_CHANNEL_TEST 1015
 #define SOUND_CHANNEL_NOTIFY 1016
 #define SOUND_CHANNEL_VOX    1017
 #define SOUND_CHANNEL_MUSIC 1018

code/datums/soundOutput.dm

@@ -13,14 +13,16 @@
 	. = ..()
 
 /datum/soundOutput/proc/process_sound(datum/sound_template/T)
-	var/sound/S = sound(T.file, T.wait, T.repeat)
+	var/sound/S = sound(T.file, T.repeat, T.wait)
 	S.volume = owner.volume_preferences[T.volume_cat] * T.volume
 	if(T.channel == 0)
 		S.channel = get_free_channel()
 	else
 		S.channel = T.channel
 	S.frequency = T.frequency
 	S.falloff = T.falloff
+	S.offset = T.offset
+	S.pitch = T.pitch
 	S.status = T.status
 	S.echo = T.echo
 	if(T.x && T.y && T.z)

code/game/objects/items/pamphlets.dm

@@ -200,7 +200,7 @@
 		to_chat(user, SPAN_WARNING("You know this already!"))
 		return FALSE
 
-	if(user.job != JOB_SQUAD_MARINE)
+	if(!(user.job in JOB_SQUAD_ROLES_LIST))
 		to_chat(user, SPAN_WARNING("Only squad riflemen can use this."))
 		return FALSE
 

code/game/objects/structures/vulture_spotter.dm

@@ -183,7 +183,10 @@
 	unscope()
 	scope_attached = FALSE
 	desc = initial(desc) + " Though, it doesn't seem to have one attached yet."
-	new /obj/item/device/vulture_spotter_scope(get_turf(src), bound_rifle)
+	if(skillless)
+		new /obj/item/device/vulture_spotter_scope/skillless(get_turf(src), bound_rifle)
+	else
+		new /obj/item/device/vulture_spotter_scope(get_turf(src), bound_rifle)
 
 /// Handler for user folding up the tripod, picking it up
 /obj/structure/vulture_spotter_tripod/proc/fold_up(mob/user)