Merge pull request #7353 from Citadel-Station-13/upstream-merge-38883

[MIRROR] Bedsheets once again influence dreams.
2018-07-10 01:56:47 -04:00
parent 33e732d983 554e1c58d2
commit 55e5d803aa
1 changed files with 9 additions and 1 deletions
@@ -5,12 +5,20 @@
 /mob/living/carbon/proc/dream()
 	set waitfor = FALSE
 	var/list/dream_fragments = list()
+	var/list/custom_dream_nouns = list()
 	var/fragment = ""

+	for(var/obj/item/bedsheet/sheet in loc)
+		custom_dream_nouns += sheet.dream_messages
+
 	dream_fragments += "you see"

 	//Subject
-	fragment += pick(GLOB.dream_strings)
+	if(custom_dream_nouns.len && prob(90))
+		fragment += pick(custom_dream_nouns)
+	else
+		fragment += pick(GLOB.dream_strings)
+
 	if(prob(50))
 		fragment = replacetext(fragment, "%ADJECTIVE%", pick(GLOB.adjectives))
 	else