From 84d5a4b721fbd623bdae6d24dff5532354df76cc Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Sat, 16 Sep 2017 23:27:20 -0400 Subject: [PATCH] jump --- code/_globalvars/lists/names.dm | 2 + code/modules/flufftext/Dreaming.dm | 30 ++------ config/names/dreams.txt | 106 +++++++++++++++++++++++++++++ config/names/nightmares.txt | 27 ++++++++ 4 files changed, 141 insertions(+), 24 deletions(-) create mode 100644 config/names/dreams.txt create mode 100644 config/names/nightmares.txt diff --git a/code/_globalvars/lists/names.dm b/code/_globalvars/lists/names.dm index be703845fb3..959c930bbf1 100644 --- a/code/_globalvars/lists/names.dm +++ b/code/_globalvars/lists/names.dm @@ -13,6 +13,8 @@ var/list/diona_names = file2list ("config/names/diona.txt") var/list/verbs = file2list("config/names/verbs.txt") var/list/adjectives = file2list("config/names/adjectives.txt") +var/list/dream_strings = file2list("config/names/dreams.txt") +var/list/nightmare_strings = file2list("config/names/nightmares.txt") //loaded on startup because of " //would include in rsc if ' was used diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm index da5d4c02694..1cce5595f32 100644 --- a/code/modules/flufftext/Dreaming.dm +++ b/code/modules/flufftext/Dreaming.dm @@ -1,21 +1,6 @@ ///DREAMS /mob/living/carbon/proc/dream() - var/global/list/dreams = list( - "an ID card","a bottle","a familiar face","a crewmember","a toolbox","a security officer","the captain", - "voices from all around","deep space","a doctor","the engine","a traitor","an ally","darkness", - "light","a scientist","a monkey","a catastrophe","a loved one","a gun","warmth","freezing","the sun", - "a hat","the Cyberiad","a ruined station","a planet","plasma","air","the medical bay","the bridge","blinking lights", - "a blue light","an abandoned laboratory","Nanotrasen","The Syndicate","blood","healing","power","respect", - "riches","space","a crash","happiness","pride","a fall","water","flames","ice","melons","flying","the eggs","money", - "the head of personnel","the head of security","a chief engineer","a research director","a chief medical officer", - "the detective","the warden","a member of the internal affairs","a station engineer","the janitor","atmospheric technician", - "the quartermaster","a cargo technician","the botanist","a shaft miner","the psychologist","the chemist","the geneticist", - "the virologist","the roboticist","the chef","the bartender","the chaplain","the librarian", "the brig physician", "the pod pilot", - "the barber", "the mechanic", "the magistrate", "the nanotrasen representative", "the blueshield", "a mouse","an ert member", - "a beach","the holodeck","a smokey room","a voice","the cold","a mouse","an operating table","the bar","the rain","a skrell", - "a unathi","a tajaran", "a vulpkanin", "a slime", "an ipc", "a vox", "a plasmaman", "a grey", "a kidan", "a diona", "a drask", "the ai core", - "the mining station","the research station", "a beaker of strange liquid" - ) + var/list/dreams = dream_strings.Copy() for(var/obj/item/weapon/bedsheet/sheet in loc) dreams += sheet.dream_messages @@ -24,17 +9,12 @@ dream_images += pick_n_take(dreams) dreaming++ for(var/i in 1 to dream_images.len) - addtimer(CALLBACK(src, proc/experience_dream, dream_images[i], FALSE), ((i - 1) * rand(30,60))) + addtimer(src, "experience_dream", ((i - 1) * rand(30,60)), FALSE, dream_images[i], FALSE) return 1 //NIGHTMARES /mob/living/carbon/proc/nightmare() - var/global/list/nightmares = list( - "a dead skrell", "a dead unathi", "a dead tajaran", "a dead vulpkanin", "a dead slime", "an dead ipc", "a dead vox", "a dead plasmaman", - "a dead grey", "a dead kidan", "a dead diona", "a dead drask", "the malf ai core", "bLoOd", "has been called", - "horrible sense of dread come over you", "red lights", "a talking mime", "WHY ARE YOU DOING THAT", "they know", "kIlL tHeM", "why", - "HoNk" - ) + var/list/nightmares = nightmare_strings.Copy() for(var/obj/item/weapon/bedsheet/sheet in loc) nightmares += sheet.nightmare_messages @@ -43,7 +23,7 @@ dream_images += pick_n_take(nightmares) nightmare++ for(var/i in 1 to dream_images.len) - addtimer(CALLBACK(src, proc/experience_dream, dream_images[i], TRUE), ((i - 1) * rand(30,60))) + addtimer(src, "experience_dream", ((i - 1) * rand(30,60)), FALSE, nightmares[i], TRUE) return 1 /mob/living/carbon/proc/handle_dreams() @@ -55,6 +35,8 @@ Stuttering(1) Jitter(20) Dizzy(20) + if(prob(4)) + AdjustHallucinate(rand(20, 60)) /mob/living/carbon/proc/experience_dream(dream_image, isNightmare) dreaming-- diff --git a/config/names/dreams.txt b/config/names/dreams.txt new file mode 100644 index 00000000000..4d6de568895 --- /dev/null +++ b/config/names/dreams.txt @@ -0,0 +1,106 @@ +an ID carda bottle +a familiar face +a crewmember +a toolbox +a security officer +the captain +voices from all around +deep space +a doctor +the engine +a traitor +an ally +darkness +light +a scientist +a monkey +a catastrophe +a loved one +a gunwarmth +freezing +the sun +a hat +the Cyberiad +a ruined station +a planet +plasma +air +the medical bay +the bridge +blinking lights +a blue light +an abandoned laboratory +Nanotrasen +The Syndicate +blood +healing +power +respect +riches +spacea crash +happiness +pride +a fall +water +flames +ice +melons +flying +the eggs +money +the head of personnel +the head of security +a chief engineer +a research director +a chief medical officer +the detective +the warden +a member of the internal affairs +a station engineer +the janitor +atmospheric technician +the quartermaster +a cargo technician +the botanist +a shaft miner +the psychologist +the chemist +the geneticist +the virologist +the roboticist +the chef +the bartender +the chaplain +the librarian +the brig physician +the pod pilot +the barber +the mechanic +the magistrate +the nanotrasen representative +the blueshield +a mouse +an ert member +a beach +the holodeck +a smokey room +the cold +an operating table +the bar +the rain +a skrell +a unathi +a tajaran +a vulpkanin +a slime +an ipc +a vox +a plasmaman +a grey +a kidan +a diona +a drask +the ai core +the mining station +the research station +a beaker of strange liquid \ No newline at end of file diff --git a/config/names/nightmares.txt b/config/names/nightmares.txt new file mode 100644 index 00000000000..9d5e6fd4a2f --- /dev/null +++ b/config/names/nightmares.txt @@ -0,0 +1,27 @@ +a dead skrell +a dead unathi +a dead tajaran +a dead vulpkanin +a dead slime +a dead ipc +a dead vox +a dead plasmaman +a dead grey +a dead kidan +a dead diona +a dead drask +the malf ai core +bLoOd +has been called +a horrible sense of dread comes over you +red lights +a talking mime +WHY ARE YOU DOING THAT +they know +kIlL tHeM +why +HoNk +aaaAAAaaaaAAAAAAaa +pApErWork +we SEE yoU +the ceiling \ No newline at end of file