Somewhat fixed huds and stuff, not 100%
This commit is contained in:
@@ -294,3 +294,34 @@
|
||||
description = "<span class='boldwarning'>I hate when my shoes come untied!</span>\n"
|
||||
mood_change = -3
|
||||
timeout = 1 MINUTES
|
||||
|
||||
/datum/mood_event/high_five_alone
|
||||
description = "<span class='boldwarning'>I tried getting a high-five with no one around, how embarassing!</span>\n"
|
||||
mood_change = -2
|
||||
timeout = 1 MINUTES
|
||||
|
||||
/datum/mood_event/high_five_full_hand
|
||||
description = "<span class='boldwarning'>Oh God, I don't even know how to high-five correctly...</span>\n"
|
||||
mood_change = -1
|
||||
timeout = 45 SECONDS
|
||||
|
||||
/datum/mood_event/left_hanging
|
||||
description = "<span class='boldwarning'>But everyone loves high fives! Maybe people just... hate me?</span>\n"
|
||||
mood_change = -2
|
||||
timeout = 1.5 MINUTES
|
||||
|
||||
/datum/mood_event/too_slow
|
||||
description = "<span class='boldwarning'>NO! HOW COULD I BE.... TOO SLOW???</span>\n"
|
||||
mood_change = -2 // multiplied by how many people saw it happen, up to 8, so potentially massive. the ULTIMATE prank carries a lot of weight
|
||||
timeout = 2 MINUTES
|
||||
|
||||
/datum/mood_event/too_slow/add_effects(param)
|
||||
var/people_laughing_at_you = 1 // start with 1 in case they're on the same tile or something
|
||||
for(var/mob/living/carbon/iter_carbon in oview(owner, 7))
|
||||
if(iter_carbon.stat == CONSCIOUS)
|
||||
people_laughing_at_you++
|
||||
if(people_laughing_at_you > 7)
|
||||
break
|
||||
|
||||
mood_change *= people_laughing_at_you
|
||||
return ..()
|
||||
|
||||
@@ -205,3 +205,18 @@
|
||||
/datum/mood_event/cleared_stomach
|
||||
description = "<span class='nicegreen'>Feels nice to get that out of the way!</span>\n"
|
||||
mood_change = 3
|
||||
|
||||
/datum/mood_event/high_five
|
||||
description = "<span class='nicegreen'>I love getting high fives!</span>\n"
|
||||
mood_change = 2
|
||||
timeout = 45 SECONDS
|
||||
|
||||
/datum/mood_event/high_ten
|
||||
description = "<span class='nicegreen'>AMAZING! A HIGH-TEN!</span>\n"
|
||||
mood_change = 3
|
||||
timeout = 45 SECONDS
|
||||
|
||||
/datum/mood_event/down_low
|
||||
description = "<span class='nicegreen'>HA! What a rube, they never stood a chance...</span>\n"
|
||||
mood_change = 4
|
||||
timeout = 1.5 MINUTES
|
||||
|
||||
@@ -929,11 +929,13 @@
|
||||
|
||||
/atom/movable/screen/alert/status_effect/strandling/Click(location, control, params)
|
||||
. = ..()
|
||||
to_chat(mob_viewer, "<span class='notice'>You attempt to remove the durathread strand from around your neck.</span>")
|
||||
if(do_after(mob_viewer, 35, null, mob_viewer))
|
||||
if(isliving(mob_viewer))
|
||||
var/mob/living/L = mob_viewer
|
||||
to_chat(mob_viewer, "<span class='notice'>You successfully remove the durathread strand.</span>")
|
||||
if(usr != owner)
|
||||
return
|
||||
to_chat(owner, "<span class='notice'>You attempt to remove the durathread strand from around your neck.</span>")
|
||||
if(do_after(owner, 35, null, owner))
|
||||
if(isliving(owner))
|
||||
var/mob/living/L = owner
|
||||
to_chat(owner, "<span class='notice'>You successfully remove the durathread strand.</span>")
|
||||
L.remove_status_effect(STATUS_EFFECT_CHOKINGSTRAND)
|
||||
|
||||
|
||||
|
||||
@@ -35,8 +35,9 @@
|
||||
next_tick = world.time + tick_interval
|
||||
if(alert_type)
|
||||
var/atom/movable/screen/alert/status_effect/A = owner.throw_alert(id, alert_type)
|
||||
A.attached_effect = src //so the alert can reference us, if it needs to
|
||||
linked_alert = A //so we can reference the alert, if we need to
|
||||
if(istype(A))
|
||||
A?.attached_effect = src //so the alert can reference us, if it needs to
|
||||
linked_alert = A //so we can reference the alert, if we need to
|
||||
START_PROCESSING(SSstatus_effects, src)
|
||||
return TRUE
|
||||
|
||||
|
||||
Reference in New Issue
Block a user