mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-28 15:47:15 +01:00
Felinids don't like getting sprayed with water. (#59506)
This PR is an ode to @Ryll-Ryll, who inspired me to try and find fun, silly things to PR to try and make people smile. About The Pull Request Felinids now get a SMALL and SHORT mood debuff when getting sprayed with water. The intent of this PR is not to provide content to grief felinid (flashback to the "Felinids hate water" pr), but rather to provide a funny interaction. Bonus point (Suggested by Ninja) : Getting sprayed with water interrupts do_after. Felinid climbing on your table ? Pssshttt. Straight in the face. PR with permission from @ninjanomnom Why It's Good For The Game Light-hearted fun and a bit of flavour to felinids. Changelog cl add: Felinids don't like getting sprayed with water. code: Adds a new status effect, incapacitated, which causes your do_afters to stop. /cl
This commit is contained in:
@@ -351,3 +351,8 @@
|
||||
description = span_warning("Cool! That's fine, I wanted to wear that soda, not drink it...\n")
|
||||
mood_change = -2
|
||||
timeout = 1 MINUTES
|
||||
|
||||
/datum/mood_event/watersprayed
|
||||
description = "<span class='boldwarning'>I hate being sprayed with water!</span>\n"
|
||||
mood_change = -5
|
||||
timeout = 30 SECONDS
|
||||
|
||||
@@ -91,6 +91,23 @@
|
||||
REMOVE_TRAIT(owner, TRAIT_HANDS_BLOCKED, TRAIT_STATUS_EFFECT(id))
|
||||
return ..()
|
||||
|
||||
//INCAPACITATED
|
||||
/// This status effect represents anything that leaves a character unable to perform basic tasks (interrupting do-afters, for example), but doesn't incapacitate them further than that (no stuns etc..)
|
||||
/datum/status_effect/incapacitating/incapacitated
|
||||
id = "incapacitated"
|
||||
|
||||
// What happens when you get the incapacitated status. You get TRAIT_INCAPACITATED added to you for the duration of the status effect.
|
||||
/datum/status_effect/incapacitating/incapacitated/on_apply()
|
||||
. = ..()
|
||||
if(!.)
|
||||
return
|
||||
ADD_TRAIT(owner, TRAIT_INCAPACITATED, TRAIT_STATUS_EFFECT(id))
|
||||
|
||||
// When the status effect runs out, your TRAIT_INCAPACITATED is removed.
|
||||
/datum/status_effect/incapacitating/incapacitated/on_remove()
|
||||
REMOVE_TRAIT(owner, TRAIT_INCAPACITATED, TRAIT_STATUS_EFFECT(id))
|
||||
return ..()
|
||||
|
||||
|
||||
//UNCONSCIOUS
|
||||
/datum/status_effect/incapacitating/unconscious
|
||||
|
||||
Reference in New Issue
Block a user