From c1dadacb198226ea27defbbd2f77aa3daf06c1ac Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Thu, 21 Sep 2017 22:04:53 -0400 Subject: [PATCH] some changes --- code/game/objects/structures/bedsheet_bin.dm | 6 +++--- code/modules/flufftext/Dreaming.dm | 4 ++-- config/names/dreams.txt | 13 ++++++++----- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index c03bbc7eba5..5aa21e78ce6 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -108,7 +108,7 @@ LINEN BINS icon_state = "sheetcaptain" item_color = "captain" dream_messages = list("authority", "a golden ID", "sunglasses", "a green disc", "an antique gun", "the captain") - nightmare_messages = list("condom", "clown with all access", "the syndicate") + nightmare_messages = list("comdom", "clown with all access", "the syndicate") /obj/item/weapon/bedsheet/rd name = "research director's bedsheet" @@ -132,7 +132,7 @@ LINEN BINS icon_state = "sheetcmo" item_color = "cmo" dream_messages = list("authority", "a silvery ID", "healing", "life", "surgery", "a cat", "the chief medical officer") - nightmare_messages = list("chemists making meth", "cryo if off", "where is the defib") + nightmare_messages = list("chemists making meth", "cryo it off", "where is the defib", "no biomass") /obj/item/weapon/bedsheet/hos name = "head of security's bedsheet" @@ -165,7 +165,7 @@ LINEN BINS icon_state = "sheetqm" item_color = "qm" dream_messages = list("a grey ID", "a shuttle", "a crate", "a sloth", "the quartermaster") - nightmare_messages = list("a blad person", "no points", "wheres the ore", "space carp") + nightmare_messages = list("a bald person", "no points", "wheres the ore", "space carp") /obj/item/weapon/bedsheet/brown icon_state = "sheetbrown" diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm index 748fd4cc0a2..07dcbad40ee 100644 --- a/code/modules/flufftext/Dreaming.dm +++ b/code/modules/flufftext/Dreaming.dm @@ -10,7 +10,7 @@ dreaming++ for(var/i in 1 to dream_images.len) addtimer(src, "experience_dream", ((i - 1) * rand(30,60)), FALSE, dream_images[i], FALSE) - return 1 + return TRUE //NIGHTMARES /mob/living/carbon/proc/nightmare() @@ -24,7 +24,7 @@ nightmare++ for(var/i in 1 to dream_images.len) addtimer(src, "experience_dream", ((i - 1) * rand(30,60)), FALSE, nightmares[i], TRUE) - return 1 + return TRUE /mob/living/carbon/proc/handle_dreams() if(client && !dreaming && prob(5)) diff --git a/config/names/dreams.txt b/config/names/dreams.txt index 4d6de568895..9effcbbf275 100644 --- a/config/names/dreams.txt +++ b/config/names/dreams.txt @@ -1,4 +1,5 @@ -an ID carda bottle +an ID card +a bottle a familiar face a crewmember a toolbox @@ -16,7 +17,8 @@ a scientist a monkey a catastrophe a loved one -a gunwarmth +a gun +warmth freezing the sun a hat @@ -37,7 +39,8 @@ healing power respect riches -spacea crash +space +a crash happiness pride a fall @@ -55,7 +58,7 @@ a research director a chief medical officer the detective the warden -a member of the internal affairs +a member of internal affairs a station engineer the janitor atmospheric technician @@ -89,7 +92,7 @@ an operating table the bar the rain a skrell -a unathi +an unathi a tajaran a vulpkanin a slime