Skip to content

Commit

Permalink
TETH rework
Browse files Browse the repository at this point in the history
  • Loading branch information
Coxswain-Navigator committed Oct 13, 2023
1 parent 7f2215e commit b82fb3b
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,28 @@
abnormality_origin = ABNORMALITY_ORIGIN_LIMBUS
var/list/give_drink = list(
"You quite an interesting one, Feel free to take this drink! It is on the house!",
"Aright, I think you deserve this drink! Drink as much as you can!",
"HA HA HA HA!!! That was quite funny of you, Feel free to take this drink from my hands.",
"Come on now, No need to worry about this drink. I made it so you can just relax...",
"*Burp* Oh, That was quite rude of me. Here is a drink as an apology for my behavior"
"Attaboy, I think you deserve this! Drink! Drink 'til you're half seas over!",
"HA HA HA HA!!! You can really talk an earful! Here, have one on me!",
"Come on now, no need to worry. Try some of this giggle water, it's the bee's knees!",
"Plum outta luck for eatery, I’ve already had all the food. Would ya care for a drink?"
)
var/list/disappointed = list(
"Really now? I don't think this will help any of us if you continue like this.",
"Okay, This is not funny, What did I do to you? I just offer drinks to people unlike the other ones.",
"This is quite sad, This is how you treat me after giving you all of you my finest drinks?",
"Come on now, Please try a bit better. Don't you want a free drink from me?",
"Hm... Let me just ask you this. Are you okay? What happend which caused you to work like this?"
"Pipe down, pinko. I don't think this will help any of us if you continue like this.",
"Come on now, what did I ever do to you? A little hootch never hurt nobody.",
"This is how you treat me after giving you all of you my finest drinks?",
"I have to go see a man about a dog.",
"Are you okay? A big shot like yourself has no need to hold back."
)

var/list/angry = list(
"I'll wring you out!",
"Come on, I'm taking you for a ride!",
"This is all I got!",
"I'll be havin' this!",
"Scram!"
)


/mob/living/simple_animal/hostile/abnormality/fairy_gentleman/SuccessEffect(mob/living/carbon/human/user, work_type, pe)
var/turf/dispense_turf = get_step(src, pick(1,2,4,5,6,8,9,10))
new/obj/item/reagent_containers/food/drinks/fairywine(dispense_turf)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@
work_count++
if(work_count < 3)
return
if(!raining)
for(var/turf/open/O in range(3, src))
new /obj/effect/rainy_effect(O)
say("Oh dear, i'd advise against being hit by this rain.") //tries to trick people into getting cover
sleep(1 SECONDS)
say("Care to join me under my umbrella?")
Expand All @@ -92,8 +95,8 @@
say ("What do you say, it's so cozy under this umbrella, isn't it?")
raining = FALSE
return TRUE
to_chat(user, "<span class='notice'>The rain is oddly reinvigorating.</span>")
user.adjustBruteLoss(-80) //The rain actually heals you, lying bastard...
for(var/obj/effect/rainy_effect/rain in range(3, src))
rain.End() //The rain actually heals you, lying bastard...
work_count = 0
covering = 2 //[[FAIRY-LONG-LEGS WILL REMEMBER THIS]]
raining = FALSE
Expand Down Expand Up @@ -131,3 +134,19 @@
SLEEP_CHECK_DEATH(15)
icon_state = "fairy_longlegs"
finishing = FALSE

//Misc. Objects
/obj/effect/rainy_effect
name = "rain"
desc = "It's pouring."
icon = 'icons/effects/weather_effects.dmi'
icon_state = "acid_rain"
layer = POINT_LAYER //want this high but not above warnings
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
anchored = TRUE

/obj/effect/rainy_effect/proc/End()
for(var/mob/living/carbon/human/H in get_turf(src))
to_chat(H, "<span class='notice'>The rain is oddly reinvigorating.</span>")
H.adjustBruteLoss(-80)
QDEL_IN(src, 30)

0 comments on commit b82fb3b

Please sign in to comment.