From 68757f1b44b5d94a647be48e4369293b1f54da0d Mon Sep 17 00:00:00 2001 From: Qustinnus Date: Thu, 8 Mar 2018 05:39:33 +0100 Subject: [PATCH] Small moodie balance changes --- code/__DEFINES/mobs.dm | 22 ++++ code/__DEFINES/traits.dm | 5 + .../mood_events/generic_negative_events.dm | 115 ++++++++++++++++++ code/game/objects/effects/decals/cleanable.dm | 9 ++ 4 files changed, 151 insertions(+) create mode 100644 code/datums/mood_events/generic_negative_events.dm diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 7af6fecce2..6f5d06f08a 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -86,6 +86,28 @@ #define SCREWYHUD_DEAD 2 #define SCREWYHUD_HEALTHY 3 +<<<<<<< HEAD +======= +//Moods levels for humans +#define MOOD_LEVEL_HAPPY4 15 +#define MOOD_LEVEL_HAPPY3 10 +#define MOOD_LEVEL_HAPPY2 6 +#define MOOD_LEVEL_HAPPY1 2 +#define MOOD_LEVEL_NEUTRAL 0 +#define MOOD_LEVEL_SAD1 -3 +#define MOOD_LEVEL_SAD2 -12 +#define MOOD_LEVEL_SAD3 -18 +#define MOOD_LEVEL_SAD4 -26 + +//Beauty levels of areas for carbons +#define BEAUTY_LEVEL_HORRID -50 +#define BEAUTY_LEVEL_BAD -25 +#define BEAUTY_LEVEL_GOOD 25 +#define BEAUTY_LEVEL_GREAT 50 + + + +>>>>>>> 0bc8550... Small moodie balance changes (#36242) //Nutrition levels for humans #define NUTRITION_LEVEL_FAT 600 #define NUTRITION_LEVEL_FULL 550 diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index 854ea01114..cbacf3f5d8 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -41,6 +41,11 @@ #define TRAIT_HOLY "holy" #define TRAIT_NOCRITDAMAGE "no_crit" +<<<<<<< HEAD +======= + + +>>>>>>> 0bc8550... Small moodie balance changes (#36242) #define TRAIT_ALCOHOL_TOLERANCE "alcohol_tolerance" #define TRAIT_AGEUSIA "ageusia" #define TRAIT_HEAVY_SLEEPER "heavy_sleeper" diff --git a/code/datums/mood_events/generic_negative_events.dm b/code/datums/mood_events/generic_negative_events.dm new file mode 100644 index 0000000000..786131b7fc --- /dev/null +++ b/code/datums/mood_events/generic_negative_events.dm @@ -0,0 +1,115 @@ +/datum/mood_event/handcuffed + description = "I guess my antics have finally caught up with me..\n" + mood_change = -1 + +/datum/mood_event/broken_vow //Used for when mimes break their vow of silence + description = "I have brought shame upon my name, and betrayed my fellow mimes by breaking our sacred vow...\n" + mood_change = -8 + +/datum/mood_event/on_fire + description = "I'M ON FIRE!!!\n" + mood_change = -8 + +/datum/mood_event/suffocation + description = "CAN'T... BREATHE...\n" + mood_change = -6 + +/datum/mood_event/burnt_thumb + description = "I shouldn't play with lighters...\n" + mood_change = -1 + timeout = 1200 + +/datum/mood_event/cold + description = "It's way too cold in here.\n" + mood_change = -2 + +/datum/mood_event/hot + description = "It's getting hot in here.\n" + mood_change = -2 + +/datum/mood_event/creampie + description = "I've been creamed. Tastes like pie flavor.\n" + mood_change = -2 + timeout = 1800 + +/datum/mood_event/slipped + description = "I slipped. I should be more careful next time...\n" + mood_change = -2 + timeout = 1800 + +/datum/mood_event/eye_stab + description = "I used to be an adventurer like you, until I took a screwdriver to the eye.\n" + mood_change = -4 + timeout = 1800 + +/datum/mood_event/delam //SM delamination + description = "Those God damn engineers can't do anything right...\n" + mood_change = -2 + timeout = 2400 + +/datum/mood_event/depression + description = "I feel sad for no particular reason.\n" + mood_change = -6 + timeout = 1200 + +/datum/mood_event/shameful_suicide //suicide_acts that return SHAME, like sord + description = "I can't even end it all!\n" + mood_change = -10 + timeout = 600 + +/datum/mood_event/dismembered + description = "AHH! I WAS USING THAT LIMB!\n" + mood_change = -8 + timeout = 2400 + +/datum/mood_event/noshoes + description = "I am a disgrace to comedy everywhere!\n" + mood_change = -3 + +/datum/mood_event/tased + description = "There's no \"z\" in \"taser\". It's in the zap.\n" + mood_change = -3 + timeout = 1200 + +/datum/mood_event/embedded + description = "Pull it out!\n" + mood_change = -6 + +/datum/mood_event/table + description = "Someone threw me on a table!\n" + mood_change = -2 + timeout = 1200 + +/datum/mood_event/brain_damage + mood_change = -3 + +/datum/mood_event/brain_damage/add_effects() + var/damage_message = pick_list_replacements("brain_damage_lines.json", "brain_damage") + description = "Hurr durr... [damage_message]\n" + +/datum/mood_event/hulk //Entire duration of having the hulk mutation + description = "HULK SMASH!\n" + mood_change = -4 + +/datum/mood_event/epilepsy //Only when the mutation causes a seizure + description = "I should have paid attention to the epilepsy warning.\n" + mood_change = -3 + timeout = 3000 + + +/datum/mood_event/grossroom + description = "This room is kind of dirty...\n" + mood_change = -3 + +/datum/mood_event/disgustingroom + description = "This room is disgusting!\n" + mood_change = -5 + +//These are unused so far but I want to remember them to use them later +/datum/mood_event/cloned_corpse + description = "I recently saw my own corpse...\n" + mood_change = -6 + +/datum/mood_event/surgery + description = "HE'S CUTTING ME OPEN!!\n" + mood_change = -8 diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm index f23f13cca4..d1fbb248b9 100644 --- a/code/game/objects/effects/decals/cleanable.dm +++ b/code/game/objects/effects/decals/cleanable.dm @@ -90,3 +90,12 @@ return bloodiness else return 0 +<<<<<<< HEAD +======= + +/obj/effect/decal/cleanable/Destroy() + . = ..() + if(src.loc && isturf(src.loc)) + var/area/A = get_area(src) + A.beauty -= beauty / max(1, A.areasize) +>>>>>>> 0bc8550... Small moodie balance changes (#36242)