Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7576

code/datums/datacore.dm

@@ -218,7 +218,7 @@ var/global/list/PDA_Manifest = list()
 			heads[++heads.len] = list("name" = name, "rank" = rank, "active" = isactive)
 			department = 1
 			depthead = 1
-			if(rank=="Colony Director" && heads.len != 1)
+			if(rank=="Site Manager" && heads.len != 1)
 				heads.Swap(1,heads.len)
 
 		if(SSjob.is_job_in_department(real_rank, DEPARTMENT_SECURITY))

code/datums/looping_sounds/_looping_sound.dm

@@ -28,6 +28,8 @@
 	var/volume = 100
 	var/max_loops
 	var/direct
+	var/vary
+	var/extra_range
 	var/opacity_check
 	var/pref_check
 
@@ -89,7 +91,7 @@
 					continue
 			SEND_SOUND(thing, S)
 		else
-			playsound(thing, S, volume, ignore_walls = !opacity_check, preference = pref_check)
+			playsound(thing, S, volume, vary, extra_range, ignore_walls = !opacity_check, preference = pref_check)
 
 /datum/looping_sound/proc/get_sound(starttime, _mid_sounds)
 	if(!_mid_sounds)

code/datums/looping_sounds/machinery_sounds.dm

@@ -9,9 +9,10 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /datum/looping_sound/supermatter
-	mid_sounds = list('sound/machines/sm/supermatter1.ogg'=1,'sound/machines/sm/supermatter2.ogg'=1,'sound/machines/sm/supermatter3.ogg'=1)
-	mid_length = 10
-	volume = 1
+	mid_sounds = list('sound/machines/sm/loops/calm.ogg'=1)
+	mid_length = 60
+	volume = 40
+	extra_range = 10
 	pref_check = /datum/client_preference/supermatter_hum
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -28,25 +29,74 @@
 
 
 /datum/looping_sound/deep_fryer
-	start_sound = 'sound/machines/fryer/deep_fryer_immerse.ogg' //my immersions
+	start_sound = 'sound/machines/kitchen/fryer/deep_fryer_immerse.ogg' //my immersions
 	start_length = 10
-	mid_sounds = list('sound/machines/fryer/deep_fryer_1.ogg' = 1, 'sound/machines/fryer/deep_fryer_2.ogg' = 1)
+	mid_sounds = list('sound/machines/kitchen/fryer/deep_fryer_1.ogg' = 1, 'sound/machines/kitchen/fryer/deep_fryer_2.ogg' = 1)
 	mid_length = 2
-	end_sound = 'sound/machines/fryer/deep_fryer_emerge.ogg'
+	end_sound = 'sound/machines/kitchen/fryer/deep_fryer_emerge.ogg'
 	volume = 15
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /datum/looping_sound/microwave
-	start_sound = 'sound/machines/microwave/microwave-start.ogg'
+	start_sound = 'sound/machines/kitchen/microwave/microwave-start.ogg'
 	start_length = 10
-	mid_sounds = list('sound/machines/microwave/microwave-mid1.ogg'=10, 'sound/machines/microwave/microwave-mid2.ogg'=1)
+	mid_sounds = list('sound/machines/kitchen/microwave/microwave-mid1.ogg'=10, 'sound/machines/kitchen/microwave/microwave-mid2.ogg'=1)
 	mid_length = 10
-	end_sound = 'sound/machines/microwave/microwave-end.ogg'
+	end_sound = 'sound/machines/kitchen/microwave/microwave-end.ogg'
 	volume = 90
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+/datum/looping_sound/oven
+	start_sound = 'sound/machines/kitchen/oven/oven-start.ogg'
+	start_length = 10
+	mid_sounds = list('sound/machines/kitchen/oven/oven-mid1.ogg'=10)
+	mid_length = 40
+	end_sound = 'sound/machines/kitchen/oven/oven-stop.ogg'
+	volume = 50
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+/datum/looping_sound/grill
+	start_sound = 'sound/machines/kitchen/grill/grill-start.ogg'
+	start_length = 10
+	mid_sounds = list('sound/machines/kitchen/grill/grill-mid1.ogg'=10)
+	mid_length = 40
+	end_sound = 'sound/machines/kitchen/grill/grill-stop.ogg'
+	volume = 50
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+/datum/looping_sound/mixer
+	start_sound = 'sound/machines/kitchen/mixer/mixer-start.ogg'
+	start_length = 10
+	mid_sounds = list('sound/machines/kitchen/mixer/mixer-mid1.ogg'=10)
+	mid_length = 10
+	end_sound = 'sound/machines/kitchen/mixer/mixer-stop.ogg'
+	volume = 50
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+/datum/looping_sound/cerealmaker
+	start_sound = 'sound/machines/kitchen/cerealmaker/cerealmaker-start.ogg'
+	start_length = 10 
+	mid_sounds = list('sound/machines/kitchen/cerealmaker/cerealmaker-mid1.ogg'=10)
+	mid_length = 60
+	end_sound = 'sound/machines/kitchen/cerealmaker/cerealmaker-stop.ogg'
+	volume = 50
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+/datum/looping_sound/candymaker
+	start_sound = 'sound/machines/kitchen/candymaker/candymaker-start.ogg'
+	start_length = 10
+	mid_sounds = list('sound/machines/kitchen/candymaker/candymaker-mid1.ogg'=10)
+	mid_length = 40
+	end_sound = 'sound/machines/kitchen/candymaker/candymaker-stop.ogg'
+	volume = 20
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 /datum/looping_sound/air_pump
 	start_sound = 'sound/machines/air_pump/airpumpstart.ogg'
 	start_length = 10

code/datums/supplypacks/costumes.dm

@@ -101,7 +101,7 @@
 			/obj/item/clothing/under/lawyer/bluesuit,
 			/obj/item/clothing/under/lawyer/purpsuit,
 			/obj/item/clothing/shoes/black = 2,
-			/obj/item/clothing/shoes/leather,
+			/obj/item/clothing/shoes/laceup/brown,
 			/obj/item/clothing/accessory/wcoat
 			)
 	name = "Formalwear (Suits)"

code/datums/supplypacks/costumes_vr.dm

@@ -174,7 +174,7 @@
 			/obj/item/clothing/under/pants/chaps,
 			/obj/item/clothing/under/pants/chaps/black,
 			/obj/item/clothing/under/harness,
-			/obj/item/clothing/shoes/leather,
+			/obj/item/clothing/shoes/laceup/brown,
 			/obj/item/clothing/shoes/boots/jungle,
 			/obj/item/clothing/shoes/boots/jackboots,
 			/obj/item/clothing/shoes/boots/cowboy,

code/datums/supplypacks/hospitality.dm

@@ -54,19 +54,12 @@
 	containertype = /obj/structure/largecrate
 	containername = "cooking oil tank crate"
 
-/datum/supply_pack/randomised/hospitality/
-	group = "Hospitality"
-
-/datum/supply_pack/randomised/hospitality/pizza
+/datum/supply_pack/hospitality/pizza
+	name = "Surprise pack of five pizzas"
 	contains = list(
-			/obj/random/pizzabox,
-			/obj/random/pizzabox,
-			/obj/random/pizzabox,
-			/obj/random/pizzabox,
-			/obj/random/pizzabox,
+			/obj/random/pizzabox = 5,
 			/obj/item/weapon/material/knife/plastic
 			)
-	name = "Surprise pack of five pizzas"
 	cost = 15
 	containertype = /obj/structure/closet/crate/freezer/centauri
 	containername = "Pizza crate"
@@ -83,4 +76,8 @@
 		)
 	cost = 10
 	containertype = /obj/structure/closet/crate/allico
-	containername = "crate of gifts"
+	containername = "crate of gifts"
+
+/datum/supply_pack/randomised/hospitality/
+	group = "Hospitality"
+