TG Sync 12/15/17

s

s

code/modules/flufftext/Dreaming.dm

@@ -1,5 +1,5 @@
-/mob/living/carbon/proc/dream()
-	set waitfor = 0
+/mob/living/carbon/proc/dream()
+	set waitfor = 0
 	var/list/dreams = GLOB.dream_strings.Copy()
 	for(var/obj/item/bedsheet/sheet in loc)
 		dreams += sheet.dream_messages
@@ -9,12 +9,12 @@
 		dreaming++
 	for(var/i in 1 to dream_images.len)
 		addtimer(CALLBACK(src, .proc/experience_dream, dream_images[i]), ((i - 1) * rand(30,60)))
-	return 1
-
-/mob/living/carbon/proc/handle_dreams()
-	if(prob(5) && !dreaming)
-		dream()
-
+	return 1
+
+/mob/living/carbon/proc/handle_dreams()
+	if(prob(5) && !dreaming)
+		dream()
+
 /mob/living/carbon/proc/experience_dream(dream_image)
 	dreaming--
 	if(stat != UNCONSCIOUS || InCritical())

code/modules/flufftext/Hallucination.dm

@@ -779,7 +779,7 @@ GLOBAL_LIST_INIT(hallucinations_major, list(
 		for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)
 			humans += H
 		person = pick(humans)
-		var/message = target.compose_message(person,understood_language,pick(radio_messages),"1459",person.get_spans(),face_name = TRUE)
+		var/message = target.compose_message(person,understood_language,pick(radio_messages),"[FREQ_COMMON]",person.get_spans(),face_name = TRUE)
 		feedback_details += "Type: Radio, Source: [person.real_name], Message: [message]"
 		to_chat(target, message)
 	qdel(src)