mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-19 03:55:11 +01:00
Felinid mood fix (#87230)
 ## About The Pull Request Showering will add negative mood effect to felinids ## Why It's Good For The Game there was a status effect that drops stamina for felinids on shower but at the same time it boosts mood i decided to make it better 🆑 Mamaii add: shower will give felinids negative mood effect fix: fixed shower hater status effect alert not showing /🆑
This commit is contained in:
@@ -76,6 +76,11 @@
|
||||
mood_change = 4
|
||||
timeout = 5 MINUTES
|
||||
|
||||
/datum/mood_event/shower_hater
|
||||
description = "I hate being wet!"
|
||||
mood_change = -2
|
||||
timeout = 3 MINUTES
|
||||
|
||||
/datum/mood_event/fresh_laundry
|
||||
description = "There's nothing like the feeling of a freshly laundered jumpsuit."
|
||||
mood_change = 2
|
||||
|
||||
@@ -618,7 +618,7 @@
|
||||
/atom/movable/screen/alert/status_effect/shower_regen/hater
|
||||
name = "Washing"
|
||||
desc = "Waaater... Fuck this WATER!!"
|
||||
icon_state = "shower_regen_hater"
|
||||
icon_state = "shower_regen_catgirl"
|
||||
|
||||
/datum/status_effect/shower_regen
|
||||
id = "shower_regen"
|
||||
|
||||
@@ -259,8 +259,11 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/shower, (-16))
|
||||
return
|
||||
var/mob/living/living_target = target
|
||||
check_heat(living_target)
|
||||
living_target.add_mood_event("shower", /datum/mood_event/nice_shower)
|
||||
living_target.apply_status_effect(/datum/status_effect/shower_regen)
|
||||
if(!HAS_TRAIT(target, TRAIT_WATER_HATER) || HAS_TRAIT(target, TRAIT_WATER_ADAPTATION))
|
||||
living_target.add_mood_event("shower", /datum/mood_event/nice_shower)
|
||||
else
|
||||
living_target.add_mood_event("shower", /datum/mood_event/shower_hater)
|
||||
|
||||
/**
|
||||
* Toggle whether shower is actually on and outputting water.
|
||||
|
||||
Reference in New Issue
Block a user