From 3ae8581d96d013605dd04e57d72c68c9b8ba9e2c Mon Sep 17 00:00:00 2001 From: Fermi <> Date: Fri, 11 Oct 2019 14:34:40 +0100 Subject: [PATCH] HOPE --- .../browserassets/css/browserOutput.css | 2 +- code/modules/holiday/halloween/bartholomew.dm | 47 +++--- code/modules/holiday/halloween/jacqueen.dm | 139 ++++++++++-------- goon/browserassets/css/browserOutput.css | 2 +- 4 files changed, 109 insertions(+), 81 deletions(-) diff --git a/code/modules/goonchat/browserassets/css/browserOutput.css b/code/modules/goonchat/browserassets/css/browserOutput.css index abd11324bc..796d630693 100644 --- a/code/modules/goonchat/browserassets/css/browserOutput.css +++ b/code/modules/goonchat/browserassets/css/browserOutput.css @@ -401,7 +401,7 @@ h1.alert, h2.alert {color: #000000;} .redtext {color: #FF0000; font-size: 24px;} .clown {color: #FF69Bf; font-size: 24px; font-family: "Comic Sans MS", cursive, sans-serif; font-weight: bold;} .his_grace {color: #15D512; font-family: "Courier New", cursive, sans-serif; font-style: italic;} -.spooky {color: #FF9100;} +.spooky {color: #FF6100;} .velvet {color: #660015; font-weight: bold; animation: velvet 5000ms infinite;} @keyframes velvet { 0% { color: #400020; } diff --git a/code/modules/holiday/halloween/bartholomew.dm b/code/modules/holiday/halloween/bartholomew.dm index 3cac9a57fe..dbc0a53d07 100644 --- a/code/modules/holiday/halloween/bartholomew.dm +++ b/code/modules/holiday/halloween/bartholomew.dm @@ -1,9 +1,13 @@ /obj/effect/landmark/barthpot name = "barthpot" + var/created = FALSE /obj/effect/landmark/barthpot/Initialize() - new /obj/item/barthpot(loc) - new /mob/living/simple_animal/jacq(loc) + if(!created) //I dunno why they spawn twice but, this is to prevent that. + new /obj/item/barthpot(loc) + new /mob/living/simple_animal/jacq(loc) + created = TRUE + ..() /obj/item/barthpot name = "Bartholomew" @@ -20,14 +24,14 @@ /obj/item/barthpot/attackby(obj/item/I, mob/user, params) - if(I) - for(var/obj/item/I2 in items_list) - if(I.type == I2.type) - qdel(I) - new /obj/item/reagent_containers/food/snacks/special_candy(loc) - say("Hooray! Thank you!") - items_list -= I2 - return + for(var/I2 in items_list) + if(I.type == I2) + qdel(I) + new /obj/item/reagent_containers/food/snacks/special_candy(loc) + to_chat(user, "You add the [I.name] to the pot and watch as it melts into the mixture, a candy crystalising in it's wake.") + say("Hooray! Thank you!") + items_list -= I2 + return say("It doesn't seem like that's magical enough!") /obj/item/barthpot/attack_hand(mob/user) @@ -36,28 +40,33 @@ say("I'm currently seeking items to put into my pot, if we get the right items, it should crystalise into a magic candy!") if(!iscarbon(user)) say("Though... I'm not sure you can help me.") - //var/mob/living/carbon/C = user - /* I'm putting too much effort into this, so I'm dialing it back - var/choices_pot = list("Check items", "Ask a question") - var/choice_pot = input(usr, "What will you do?", "What will you do?") in choices_reward - switch(choice_pot) - if("Check items")*/ var/message = "From what I can tell, " if(LAZYLEN(items_list) < 5) generate_items() - for(var/obj/item/I2 in items_list) - message += "[I2.name], " + for(var/I2 in items_list) + var/obj/item/I3 = new I2 + message += "a [I3.name], " message += "currently seem to have the most magic potential." say("[message]") /obj/item/barthpot/proc/generate_items() var/length = LAZYLEN(items_list) + var/no_list = list(/obj/effect/spawner/lootdrop/glowstick, + /obj/effect/spawner/lootdrop/mre, + /obj/item/stack/cable_coil/random, + /obj/item/stack/cable_coil/random/five, + /obj/item/stack/rods/ten, + /obj/item/stack/rods/twentyfive, + /obj/item/stack/rods/fifty, + /obj/item/stack/sheet/metal/twenty) if(length == 5) return TRUE //var/metalist = pickweight(GLOB.maintenance_loot) for(var/i = length, i <= 5, i+=1) var/obj/item = pickweight(GLOB.maintenance_loot) - message_admins("[item]") + if(item in no_list) + i-=1 + continue items_list += item return TRUE diff --git a/code/modules/holiday/halloween/jacqueen.dm b/code/modules/holiday/halloween/jacqueen.dm index 80420d9ea5..7c3901fa51 100644 --- a/code/modules/holiday/halloween/jacqueen.dm +++ b/code/modules/holiday/halloween/jacqueen.dm @@ -18,39 +18,53 @@ maxHealth = INFINITY health = INFINITY density = FALSE + speech_span = "spooky" + var/last_poof var/progression = list() //Keep track of where people are in the story. /mob/living/simple_animal/jacq/Initialize() ..() poof() +/mob/living/simple_animal/jacq/life() + ..() + if((last_poof+3 MINUTES) < world.realtime) + poof() + /mob/living/simple_animal/jacq/Destroy() //I.e invincible visible_message("[src] cackles, \"You'll nae get rid a me that easily!\"") - playsound(loc, 'sound/spookoween/ahaha.ogg', 100, 0.5) + playsound(loc, 'sound/spookoween/ahaha.ogg', 100, 0.25) var/mob/living/simple_animal/jacq/Jacq = new src.type(loc) Jacq.progression = progression ..() /mob/living/simple_animal/jacq/death() //What is alive may never die visible_message("[src] cackles, \"You'll nae get rid a me that easily!\"") - playsound(loc, 'sound/spookoween/ahaha.ogg', 100, 0.5) + playsound(loc, 'sound/spookoween/ahaha.ogg', 100, 0.25) health = 20 poof() /mob/living/simple_animal/jacq/attack_hand(mob/living/carbon/human/M) + canmove = FALSE chit_chat(M) + canmove = TRUE ..() /mob/living/simple_animal/jacq/attack_paw(mob/living/carbon/monkey/M) + canmove = FALSE chit_chat(M) + canmove = TRUE ..() /mob/living/simple_animal/jacq/proc/poof() + last_poof = world.realtime var/datum/reagents/R = new/datum/reagents(100)//Hey, just in case. var/datum/effect_system/smoke_spread/chem/s = new() R.add_reagent("secretcatchem", (10)) - s.set_up(R, 1, loc) + s.set_up(R, 0, loc) s.start() + visible_message("[src] disappears in a puff of smoke!") + canmove = TRUE var/hp_list = list() for(var/obj/machinery/holopad/hp in world) @@ -60,7 +74,6 @@ if(forceMove(pick(hp.loc))) return TRUE - message_admins("Failed to move") return FALSE //Ye wee bugger, gerrout of it. Ye've nae tae enjoy reading the code fer mae secrets like. @@ -74,9 +87,9 @@ gender = "lassie" if(!progression["[C.real_name]"] || !(progression["[C.real_name]"] & JACQ_HELLO)) - visible_message("[src] smiles ominously at [C], \"Well halo there [gender]! Ah'm Jacqueline, tae great Pumpqueen, great tae meet ye.\"") + visible_message("[src] smiles ominously at [C], \"Well halo there [gender]! Ah'm Jacqueline, tae great Pumpqueen, great tae meet ye.\"") sleep(20) - visible_message("[src] continues, says, \"Ah'm sure yae well stunned, but ah've got nae taem fer that. Ah'm after the candies around this station. If yae get mae enoof o the wee buggers, Ah'll give ye a treat, or if yae feeling bold, Ah ken trick ye instead.\" giving [C] a wide grin.") + visible_message("[src] continues, says, \"Ah'm sure yae well stunned, but ah've got nae taem fer that. Ah'm after the candies around this station. If yae get mae enoof o the wee buggers, Ah'll give ye a treat, or if yae feeling bold, Ah ken trick ye instead.\" giving [C] a wide grin.") if(!progression["[C.real_name]"]) progression["[C.real_name]"] = NONE //TO MAKE SURE THAT THE LIST ENTRY EXISTS. @@ -92,14 +105,14 @@ if(check_candies(C)) treat(C, gender) else - visible_message("[src] raises an eyebrown, \"You've nae got any candies Ah want! They're the orange round ones, now bugger off an go get em first.\"") + visible_message("[src] raises an eyebrow, \"You've nae got any candies Ah want! They're the orange round ones, now bugger off an go get em first.\"") return if("How do I get candies?") - visible_message("[src] says, \"Gae find my familiar; Bartholomew. Ee's tendin the cauldron which ken bring oot t' magic energy in items scattered aroond. Knowing him, ee's probably gone tae somewhere with books.\"") + visible_message("[src] says, \"Gae find my familiar; Bartholomew. Ee's tendin the cauldron which ken bring oot t' magic energy in items scattered aroond. Knowing him, ee's probably gone tae somewhere with books.\"") return /mob/living/simple_animal/jacq/proc/treat(mob/living/carbon/C, gender) - visible_message("[src] gives off a glowing smile, \"What ken Ah offer ye? I can magic up an object, a potion or a plushie fer ye.\"") + visible_message("[src] gives off a glowing smile, \"What ken Ah offer ye? I can magic up an object, a potion or a plushie fer ye.\"") var/choices_reward = list("Object - 3 candies", "Potion - 2 candies", "Plushie - 1 candy", "Can I ask you a question instead?") var/choice_reward = input(usr, "Trick or Treat?", "Trick or Treat?") in choices_reward @@ -107,7 +120,7 @@ switch(choice_reward) if("Object - 3 candies") if(!take_candies(C, 3)) - visible_message("[src] raises an eyebrown, \"It's 3 candies per trinket [gender]! Thems the rules!\"") + visible_message("[src] raises an eyebrown, \"It's 3 candies per trinket [gender]! Thems the rules!\"") return var/new_obj = pick(subtypesof(/obj)) @@ -116,23 +129,29 @@ // panic() var/reward = new new_obj(C.loc) C.put_in_hands(reward) + visible_message("[src] waves her hands, magicing up a [reward] from thin air, \"There ye are [gender], enjoy! \"") + sleep(20) poof() return if("Potion - 2 candies") if(!take_candies(C, 2)) - visible_message("[src] raises an eyebrown, \"It's 2 candies per potion [gender]! Thems the rules!\"") + visible_message("[src] raises an eyebrow, \"It's 2 candies per potion [gender]! Thems the rules!\"") return var/reward = new /obj/item/reagent_containers/potion_container(C.loc) C.put_in_hands(reward) + visible_message("[src] waves her hands, magicing up a [reward] from thin air, \"There ye are [gender], enjoy! \"") + sleep(20) poof() return if("Plushie - 1 candy") if(!take_candies(C, 1)) - visible_message("[src] raises an eyebrown, \"It's 1 candy per plushie [gender]! Thems the rules!\"") + visible_message("[src] raises an eyebrow, \"It's 1 candy per plushie [gender]! Thems the rules!\"") return new /obj/item/toy/plush/random(C.loc) + visible_message("[src] waves her hands, magicing up a plushie from thin air, \"There ye are [gender], enjoy! \"") + sleep(20) poof() return @@ -142,68 +161,75 @@ //Figure out where the C is in the story if(!progression["[C.real_name]"]) //I really don't want to get here withoot a hello, but just to be safe progression["[C.real_name]"] = NONE - if(!progression["[C.real_name]"] & JACQ_FAR) + if(!(progression["[C.real_name]"] & JACQ_FAR)) if(progression["[C.real_name]"] & JACQ_CANDIES) choices += "You really came all this way for candy?" else choices += "Why do you want the candies?" - if(!progression["[C.real_name]"] & JACQ_HEAD) + if(!(progression["[C.real_name]"] & JACQ_HEAD)) choices += "What is that on your head?" - if(!progression["[C.real_name]"] & JACQ_EXPELL) - if(progression["[C.real_name]"] & JACQ_WITCH & JACQ_FAR) + if(!(progression["[C.real_name]"] & JACQ_EXPELL)) + if(progression["[C.real_name]"] & JACQ_WITCH) choices += "So you got ex-spell-ed?" else choices += "Are you a witch?" //for Kepler, delete this, or just delete the whole story aspect if you want. //If fully completed - if(progression["[C.real_name]"] & JACQ_FAR & JACQ_EXPELL & JACQ_HEAD) - choices = "Can I take you out on a date?" + /* + if(progression["[C.real_name]"] & JACQ_FAR)//Damnit this is a pain + if(progression["[C.real_name]"] & JACQ_EXPELL) //I give up + if(progression["[C.real_name]"] & JACQ_HEAD) //This is only an event thing + choices += "Can I take you out on a date?" + */ + if(progression["[C.real_name]"] == 63)//Damnit this is a pain + choices += "Can I take you out on a date?" //If you've nothing to ask if(!LAZYLEN(choices)) - visible_message("[src] raises an eyebrown, \"Ah'm all questioned oot fer noo, [gender].\"") + visible_message("[src] sighs, \"Ah'm all questioned oot fer noo, [gender].\"") return //Otherwise, lets go! - visible_message("[src] says, \"A question? Sure, it'll cost you a candy though!\"") + visible_message("[src] says, \"A question? Sure, it'll cost you a candy though!\"") choices += "Nevermind" //Candies for chitchats var/choice = input(C, "What do you want to ask?", "What do you want to ask?") in choices if(!take_candies(C, 1)) - visible_message("[src] raises an eyebrown, \"It's a candy per question [gender]! Thems the rules!\"") + visible_message("[src] raises an eyebrow, \"It's a candy per question [gender]! Thems the rules!\"") return //Talking switch(choice) if("Why do you want the candies?") - visible_message("[src] says, \"Ave ye tried them? They're full of all sorts of reagents. Ah'm after them so ah ken magic em up an hopefully find rare stuff fer me brews. Honestly it's a lot easier magicking up tatt fer ye lot than runnin aroond on me own like. I'd ask me familiars but most a my familiars are funny fellows 'n constantly bugger off on adventures when given simple objectives like; Go grab me a tea cake or watch over me cauldron. Ah mean, ye might run into Bartholomew my cat. Ee's supposed tae be tending my cauldron, but I've nae idea where ee's got tae.\"") + visible_message("[src] says, \"Ave ye tried them? They're full of all sorts of reagents. Ah'm after them so ah ken magic em up an hopefully find rare stuff fer me brews. Honestly it's a lot easier magicking up tatt fer ye lot than runnin aroond on me own like. I'd ask me familiars but most a my familiars are funny fellows 'n constantly bugger off on adventures when given simple objectives like; Go grab me a tea cake or watch over me cauldron. Ah mean, ye might run into Bartholomew my cat. Ee's supposed tae be tending my cauldron, but I've nae idea where ee's got tae.\"") progression["[C.real_name]"] = progression["[C.real_name]"] | JACQ_CANDIES if("You really came all this way for candy?") - visible_message("[src] looks tae the side sheepishly, \"Aye, well, tae be honest, Ah'm here tae see me sis, but dunnae let her knew that. She's an alchemist too like, but she dunnae use a caldron like mae, she buggered off like tae her posh ivory tower tae learn bloody chemistry instead!\" [src] scowls, \"She's tae black sheep o' the family too, so we dunnae see eye tae eye sometimes on alchemy. Ah mean, she puts moles in her brews! Ye dunnae put moles in yer brews! Yae threw your brews at tae wee bastards an blew em up!\" [src] sighs \"But she's a heart o gold so.. Ah wanted tae see her an check up oon her, make sure she's okay.\"") + visible_message("[src] looks tae the side sheepishly, \"Aye, well, tae be honest, Ah'm here tae see me sis, but dunnae let her knew that. She's an alchemist too like, but she dunnae use a caldron like mae, she buggered off like tae her posh ivory tower tae learn bloody chemistry instead!\" [src] scowls, \"She's tae black sheep o' the family too, so we dunnae see eye tae eye sometimes on alchemy. Ah mean, she puts moles in her brews! Ye dunnae put moles in yer brews! Yae threw your brews at tae wee bastards an blew em up!\" [src] sighs, \"But she's a heart o gold so.. Ah wanted tae see her an check up oon her, make sure she's okay.\"") progression["[C.real_name]"] = progression["[C.real_name]"] | JACQ_FAR if("What is that on your head?") - visible_message("[src] pats the pumpkin atop her head, \"This thing? This ain't nae ordinary pumpkin! Me Ma grew this monster ooer a year o love, dedication an hard work. Honestly it felt like she loved this thing more than any of us, which Ah knew ain't true an it's not like she was hartless or anything but.. well, we had a falling oot when Ah got back home with all me stuff in tow. An all she had done is sent me owl after owl over t' last year aboot this bloody pumpkin and ah had enough. So ah took it, an put it on me head. You know, as ye do. Ah am the great Pumpqueen after all, Ah deserve this.\"") + visible_message("[src] pats the pumpkin atop her head, \"This thing? This ain't nae ordinary pumpkin! Me Ma grew this monster ooer a year o love, dedication an hard work. Honestly it felt like she loved this thing more than any of us, which Ah knew ain't true an it's not like she was hartless or anything but.. well, we had a falling oot when Ah got back home with all me stuff in tow. An all she had done is sent me owl after owl over t' last year aboot this bloody pumpkin and ah had enough. So ah took it, an put it on me head. You know, as ye do. Ah am the great Pumpqueen after all, Ah deserve this.\"") progression["[C.real_name]"] = progression["[C.real_name]"] | JACQ_HEAD if("Are you a witch?") - visible_message("[src] grumbles, \"If ye must know, Ah got kicked oot of the witch academy fer being too much of a \"loose cannon\". A bloody loose cannon? Nae they were just pissed off Ah had the brass tae proclaim myself as the Pumpqueen! And also maybe the time Ah went and blew up one of the towers by trying tae make a huge batch of astrogen might've had something tae do with it. Ah mean it would've worked fine if the cauldrons weren't so shite and were actually upgraded by the faculty. So technically no, I'm not a witch.\"") + visible_message("[src] grumbles, \"If ye must know, Ah got kicked oot of the witch academy fer being too much of a \"loose cannon\". A bloody loose cannon? Nae they were just pissed off Ah had the brass tae proclaim myself as the Pumpqueen! And also maybe the time Ah went and blew up one of the towers by trying tae make a huge batch of astrogen might've had something tae do with it. Ah mean it would've worked fine if the cauldrons weren't so shite and were actually upgraded by the faculty. So technically no, I'm not a witch.\"") progression["[C.real_name]"] = progression["[C.real_name]"] | JACQ_WITCH if("So you got ex-spell-ed?") - visible_message("[src] Gives you a blank look at the pun, before continuing, \"Not quite, Ah know Ah ken get back into the academy, it's only an explosion, they happen all the time, but, tae be fair it's my fault that things came tae their explosive climax. You don't know what it's like when you're after a witch doctorate, everyone else is doing well, everyone's making new spells and the like, and I'm just good at making explosions really, or fireworks. So, Ah did something Ah knew was dangerous, because Ah had tae do something tae stand oot, but Ah know this life ain't fer me, Ah don't want tae be locked up in dusty towers, grinding reagent after reagent together, trying tae find new reactions, some of the wizards in there haven't left fer years. Ah want tae live, Ah want tae fly around on a broom, turn people into cats fer a day and disappear cackling! That's what got me into witchcraft!\" she throws her arms up in the arm, spinning the pumpkin upon her head slightly. She carefully spins it back to face you, giving oot a soft sigh, \"Ah know my mother's obsession with this dumb thing on my head is just her trying tae fill the void of me and my sis moving oot, and it really shouldn't be on my head. And Ah know that I'm really here tae get help from my sis.. She's the sensible one, and she gives good hugs.\"") - sleep(50) - visible_message("[src] says, \"Thanks [C], Ah guess Ah didn't realise Ah needed someone tae talk tae but, I'm glad ye spent all your candies talking tae me. Funny how things seem much worse in yer head.\"") + visible_message("[src] Gives you a blank look at the pun, before continuing, \"Not quite, Ah know Ah ken get back into the academy, it's only an explosion, they happen all the time, but, tae be fair it's my fault that things came tae their explosive climax. You don't know what it's like when you're after a witch doctorate, everyone else is doing well, everyone's making new spells and the like, and I'm just good at making explosions really, or fireworks. So, Ah did something Ah knew was dangerous, because Ah had tae do something tae stand oot, but Ah know this life ain't fer me, Ah don't want tae be locked up in dusty towers, grinding reagent after reagent together, trying tae find new reactions, some of the wizards in there haven't left fer years. Ah want tae live, Ah want tae fly around on a broom, turn people into cats fer a day and disappear cackling! That's what got me into witchcraft!\" she throws her arms up in the arm, spinning the pumpkin upon her head slightly. She carefully spins it back to face you, giving oot a soft sigh, \"Ah know my mother's obsession with this dumb thing on my head is just her trying tae fill the void of me and my sis moving oot, and it really shouldn't be on my head. And Ah know that I'm really here tae get help from my sis.. She's the sensible one, and she gives good hugs.\"") + sleep(30) + visible_message("[src] says, \"Thanks [C], Ah guess Ah didn't realise Ah needed someone tae talk tae but, I'm glad ye spent all your candies talking tae me. Funny how things seem much worse in yer head.\"") progression["[C.real_name]"] = progression["[C.real_name]"] | JACQ_EXPELL if("Can I take you out on a date?") - visible_message("[src] blushes, \"...You want tae ask me oot on a date? Me? After all that nonsense Ah just said? It seems a waste of a candy honestly.\"") + visible_message("[src] blushes, \"...You want tae ask me oot on a date? Me? After all that nonsense Ah just said? It seems a waste of a candy honestly.\"") progression["[C.real_name]"] = progression["[C.real_name]"] | JACQ_DATE - visible_message("[src] looks to the side, deep in thought.") + visible_message("[src] looks to the side, deep in thought.") dating_start(C, gender) if("Nevermind") - visible_message("[src] shurgs, \"Suit yerself then.\"") + visible_message("[src] shrugs, \"Suit yerself then, here's your candy back.\"") + new /obj/item/reagent_containers/food/snacks/special_candy(loc) /mob/living/simple_animal/jacq/proc/trick(mob/living/carbon/C, gender) @@ -214,43 +240,33 @@ option = rand(1,6) switch(option) if(1) - visible_message("[src] waves their arms around, \"Hocus pocus, making friends is now your focus!\"") + visible_message("[src] waves their arms around, \"Hocus pocus, making friends is now your focus!\"") var/datum/objective/brainwashing/objective = pick("Make a tasty sandwich for", "Compose a poem for", "Aquire a nice outfit to give to", "Strike up a conversation about pumpkins with", "Write a letter and deliver it to", "Give a nice hat to") var/mob/living/L2 = pick(GLOB.player_list) objective += " [L2.name]." brainwash(C, objective) if(2) - visible_message("[src] waves their arms around, \"Off comes your head, atleast you're not dead.\"") + visible_message("[src] waves their arms around, \"Off comes your head, atleast you're not dead.\"") C.reagents.add_reagent("pumpkinmutationtoxin", 5) - //doesn't work if(3) - visible_message("[src] waves their arms around, \"If only you had a better upbringing, your ears are now full of my singing!\"") - var/spowoky = "https://www.youtube.com/watch?v=PFrPrIxluWk" - var/web_sound_input = trim(spowoky) - var/ytdl = CONFIG_GET(string/invoke_youtubedl) - var/shell_scrubbed_input = shell_url_scrub(web_sound_input) - var/list/output = world.shelleo("[ytdl] --format \"bestaudio\[ext=mp3]/best\[ext=mp4]\[height<=360]/bestaudio\[ext=m4a]/bestaudio\[ext=aac]\" --dump-single-json --no-playlist -- \"[shell_scrubbed_input]\"") - var/stdout = output[SHELLEO_STDOUT] //unknown value: - var/list/data = json_decode(stdout) - var/web_sound_url = data["url"] + visible_message("[src] waves their arms around, \"If only you had a better upbringing, your ears are now full of my singing!\"") var/client/C2 = C.client - C2.chatOutput.sendMusic(web_sound_url, 1)//I hope this works! - //doesn't work + C2.chatOutput.sendMusic("https://r7---sn-8pgbpohxqp5-ac5s.googlevideo.com/videoplayback?expire=1570819286&ei=dnigXYTiBMLRVNztg9gM&ip=77.102.34.231&id=o-AP8PCBwt0qmzHIAk-FSIJnf_Xw_dgxjA68-Di8J1GwSE&itag=18&source=youtube&requiressl=yes&mm=31%2C29&mn=sn-8pgbpohxqp5-ac5s%2Csn-aigl6nl7&ms=au%2Crdu&mv=m&mvi=6&pl=22&initcwndbps=2828750&mime=video%2Fmp4&gir=yes&clen=5905497&ratebypass=yes&dur=138.158&lmt=1540846216924007&mt=1570797587&fvip=5&fexp=23842630&c=WEB&txp=5531432&sparams=expire%2Cei%2Cip%2Cid%2Citag%2Csource%2Crequiressl%2Cmime%2Cgir%2Cclen%2Cratebypass%2Cdur%2Clmt&lsparams=mm%2Cmn%2Cms%2Cmv%2Cmvi%2Cpl%2Cinitcwndbps&lsig=AHylml4wRAIgew1V2b-qkhVv615GHSY8hvWYFoHdE4uhrc0iqS7FwrgCIHuxn3Qh0oz8WOv3m6vU0WE95GCzE-RhICfKFmX0Y5kf&sig=ALgxI2wwRQIhAMrZpFtHYr5jMZCvZAWabAF3BEkFDjWfGEV27PvykOcHAiA14Oq3ir2OSEVpEmfWW4nEhuIljF7xEIQCeNJDXdo9bw==", 1)//I hope this works! if(4) - visible_message("[src] waves their arms around, \"You're cute little bumpkin, On your head is a pumpkin!\"") + visible_message("[src] waves their arms around, \"You're cute little bumpkin, On your head is a pumpkin!\"") if(C.head) var/obj/item/W = C.head C.dropItemToGround(W, TRUE) var/jaqc_latern = new /obj/item/clothing/head/hardhat/pumpkinhead/jaqc C.equip_to_slot(jaqc_latern, SLOT_HEAD, 1, 1) if(5) - visible_message("[src] waves their arms around, \"In your body there's something amiss, you'll find it's a chem made by my sis!\"") + visible_message("[src] waves their arms around, \"In your body there's something amiss, you'll find it's a chem made by my sis!\"") C.reagents.add_reagent("eigenstate", 30) if(6) - visible_message("[src] waves their arms around, \"A new familiar for me, and you'll see it's thee!\"") + visible_message("[src] waves their arms around, \"A new familiar for me, and you'll see it's thee!\"") C.reagents.add_reagent("secretcatchem", 30) if(7) - visible_message("[src] waves their arms around, \"While you may not be a ghost, for this sheet you'll always be it's host.\"") + visible_message("[src] waves their arms around, \"While you may not be a ghost, for this sheet you'll always be it's host.\"") var/mob/living/carbon/human/H = C if(H.wear_suit) var/obj/item/W = H.wear_suit @@ -274,11 +290,11 @@ return else candies =- C2 - visible_message("[src] looks to the side, \"Look, Ah like ye but, Ah don't think Ah can right now. If ye can't tell, the stations covered in volatile candies, I've a few other laddies and lassies running after me treats, and tae top it all off, I've the gods breathing down me neck, watching every treat Ah make fer the lot of yous.\" she sighs, \"But that's not a no, right? That's.. just a nae right noo.\"") + visible_message("[src] looks to the side, \"Look, Ah like ye but, Ah don't think Ah can right now. If ye can't tell, the stations covered in volatile candies, I've a few other laddies and lassies running after me treats, and tae top it all off, I've the gods breathing down me neck, watching every treat Ah make fer the lot of yous.\" she sighs, \"But that's not a no, right? That's.. just a nae right noo.\"") sleep(20) - visible_message("[src] takes off the pumpkin on her head, a rich blush on her cheeks. She leans over planting a kiss upon your forehead quickly befere popping the pumpkin back on her head.") + visible_message("[src] takes off the pumpkin on her head, a rich blush on her cheeks. She leans over planting a kiss upon your forehead quickly befere popping the pumpkin back on her head.") sleep(10) - visible_message("[src] waves their arms around, \"There, that aught tae be worth a candy.\"") + visible_message("[src] waves their arms around, \"There, that aught tae be worth a candy.\"") sleep(20) poof() @@ -348,18 +364,21 @@ name = "potion" icon = 'icons/obj/halloween_items.dmi' icon_state = "jacq_potion" + desc = "A potion with a strange concoction within. Be careful, as if it's thrown it explodes in a puff of smoke like Jacqueline." /obj/item/reagent_containers/potion_container/Initialize() - ..() - var/datum/reagent/R = pick(subtypesof(/datum/reagent)) - reagents.add_reagent(R.id, 30) - name = "[R.id] Potion" + .=..() + var/R = get_random_reagent_id() + reagents.add_reagent(R, 30) + name = "[R] Potion" /obj/item/reagent_containers/potion_container/throw_impact(atom/target) - var/datum/effect_system/smoke_spread/chem/s = new() - s.set_up(src.reagents, 3, target.loc) - s.start() ..() + sleep(50) + var/datum/effect_system/smoke_spread/chem/s = new() + s.set_up(src.reagents, 3, src.loc) + s.start() + qdel(src) //Candies /obj/item/reagent_containers/food/snacks/special_candy @@ -368,5 +387,5 @@ icon_state = "jacq_candy" /obj/item/reagent_containers/food/snacks/special_candy/Initialize() + .=..() reagents.add_reagent(get_random_reagent_id(), 5) - ..() diff --git a/goon/browserassets/css/browserOutput.css b/goon/browserassets/css/browserOutput.css index 5ed60b1d0a..174aa8a22f 100644 --- a/goon/browserassets/css/browserOutput.css +++ b/goon/browserassets/css/browserOutput.css @@ -393,7 +393,7 @@ h1.alert, h2.alert {color: #000000;} .redtext {color: #FF0000; font-size: 24px;} .clown {color: #FF69Bf; font-size: 24px; font-family: "Comic Sans MS", cursive, sans-serif; font-weight: bold;} .his_grace {color: #15D512; font-family: "Courier New", cursive, sans-serif; font-style: italic;} -.spooky {color: #FF9100;} +.spooky {color: #FF6100;} .velvet {color: #660015; font-weight: bold; animation: velvet 5000ms infinite;} @keyframes velvet { 0% { color: #400020; }