-
Notifications
You must be signed in to change notification settings - Fork 33
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adds in the caffeinated quirk. More sprint... If you can keep it. (#391)
- Loading branch information
1 parent
9325b18
commit 60968f5
Showing
10 changed files
with
261 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,5 @@ | ||
// --Adds the trait for the cardcollector quirk | ||
#define TRAIT_CARDCOLLECTOR "cardcollector" | ||
#define TRAIT_SHARPNESS_VULNERABLE "sharpnessvulnerable" | ||
///Gives positive mood on drinking anything caffeinated, kinda generic so people can like coffee, tea, energy drinks, whatever. | ||
#define TRAIT_CAFFEINE_LOVER "caffeine_lover" |
19 changes: 19 additions & 0 deletions
19
maplestation_modules/code/datums/mood_events/quirk_mood_events.dm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
/datum/mood_event/no_coffee | ||
description = "DON'T TALK TO ME, UNTIL I'VE HAD MY COFFEE!!" | ||
mood_change = -8 | ||
|
||
/datum/mood_event/low_caffeine | ||
description = "I'm feeling low on caffeine... I'm so tired..." | ||
mood_change = -4 | ||
|
||
/datum/mood_event/high_caffeine | ||
description = "That caffeine really helped me to be so energetic!" | ||
mood_change = 2 | ||
|
||
/datum/mood_event/way_too_high_caffeine | ||
description = "CAFFEINE IS MY GOD, AND I AM THE HUMAN INSTRUMENT OF ITS WILL!!!" | ||
mood_change = 10 | ||
|
||
/datum/mood_event/caffeine_death | ||
description = "OW GOD MY HEART IS BEATING REALLY FAST- AAAAND I THINK IT JUST STOPPED BEATING." | ||
mood_change = -10 |
27 changes: 21 additions & 6 deletions
27
maplestation_modules/code/datums/mood_events/reagent_mood_events.dm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters