diff --git a/code/datums/mood_events/drink_events.dm b/code/datums/mood_events/drink_events.dm index b2e9861c41..cb4c300f60 100644 --- a/code/datums/mood_events/drink_events.dm +++ b/code/datums/mood_events/drink_events.dm @@ -6,19 +6,19 @@ /datum/mood_event/quality_nice description = "That drink wasn't bad at all.\n" mood_change = 1 - timeout = 2 MINUTESS + timeout = 2 MINUTE /datum/mood_event/quality_good description = "That drink was pretty good.\n" mood_change = 2 - timeout = 2 MINUTESS + timeout = 2 MINUTE /datum/mood_event/quality_verygood description = "That drink was great!\n" mood_change = 3 - timeout = 2 MINUTESS + timeout = 2 MINUTE /datum/mood_event/quality_fantastic description = "That drink was amazing!\n" mood_change = 4 - timeout = 2 MINUTESS + timeout = 2 MINUTE diff --git a/code/datums/mood_events/generic_negative_events.dm b/code/datums/mood_events/generic_negative_events.dm index 8c4a6c67aa..20dacdd38f 100644 --- a/code/datums/mood_events/generic_negative_events.dm +++ b/code/datums/mood_events/generic_negative_events.dm @@ -19,7 +19,7 @@ /datum/mood_event/burnt_thumb description = "I shouldn't play with lighters...\n" mood_change = -1 - timeout = 2 MINUTESS + timeout = 2 MINUTE /datum/mood_event/cold description = "It's way too cold in here.\n" @@ -32,17 +32,17 @@ /datum/mood_event/creampie description = "I've been creamed. Tastes like pie flavor.\n" mood_change = -2 - timeout = 3 MINUTESS + timeout = 3 MINUTE /datum/mood_event/slipped description = "I slipped. I should be more careful next time...\n" mood_change = -2 - timeout = 3 MINUTESS + timeout = 3 MINUTE /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 = 3 MINUTESS + timeout = 3 MINUTE /datum/mood_event/delam //SM delamination description = "Those God damn engineers can't do anything right...\n" @@ -52,7 +52,7 @@ /datum/mood_event/depression description = "I feel sad for no particular reason.\n" mood_change = -9 - timeout = 2 MINUTESS + timeout = 2 MINUTE /datum/mood_event/shameful_suicide //suicide_acts that return SHAME, like sord description = "I can't even end it all!\n" @@ -71,7 +71,7 @@ /datum/mood_event/tased description = "There's no \"z\" in \"taser\". It's in the zap.\n" mood_change = -3 - timeout = 2 MINUTESS + timeout = 2 MINUTE /datum/mood_event/embedded description = "Pull it out!\n" @@ -80,7 +80,7 @@ /datum/mood_event/table description = "Someone threw me on a table!\n" mood_change = -2 - timeout = 2 MINUTESS + timeout = 2 MINUTE /datum/mood_event/table/add_effects() if(ishuman(owner)) @@ -122,7 +122,7 @@ /datum/mood_event/healsbadman description = "I feel a lot better, but wow that was disgusting.\n" mood_change = -4 - timeout = 2 MINUTESS + timeout = 2 MINUTE /datum/mood_event/jittery description = "I'm nervous and on edge and I can't stand still!!\n" @@ -131,12 +131,12 @@ /datum/mood_event/vomit description = "I just threw up. Gross.\n" mood_change = -2 - timeout = 2 MINUTESS + timeout = 2 MINUTE /datum/mood_event/vomitself description = "I just threw up all over myself. This is disgusting.\n" mood_change = -4 - timeout = 3 MINUTESS + timeout = 3 MINUTE /datum/mood_event/painful_medicine description = "Medicine may be good for me but right now it stings like hell.\n" diff --git a/code/datums/mood_events/generic_positive_events.dm b/code/datums/mood_events/generic_positive_events.dm index 7710c730eb..acc8a620ad 100644 --- a/code/datums/mood_events/generic_positive_events.dm +++ b/code/datums/mood_events/generic_positive_events.dm @@ -1,7 +1,7 @@ /datum/mood_event/hug description = "Hugs are nice.\n" mood_change = 1 - timeout = 2 MINUTESS + timeout = 2 MINUTE /datum/mood_event/arcade description = "I beat the arcade game!\n" @@ -50,7 +50,7 @@ /datum/mood_event/jolly description = "I feel happy for no particular reason.\n" mood_change = 6 - timeout = 2 MINUTESS + timeout = 2 MINUTE /datum/mood_event/focused description = "I have a goal, and I will reach it, whatever it takes!\n" //Used for syndies, nukeops etc so they can focus on their goals @@ -83,9 +83,9 @@ /datum/mood_event/chemical_laughter description = "Laughter really is the best medicine! Or is it?\n" mood_change = 4 - timeout = 3 MINUTESS + timeout = 3 MINUTE /datum/mood_event/chemical_superlaughter description = "*WHEEZE*\n" mood_change = 12 - timeout = 3 MINUTESS + timeout = 3 MINUTE diff --git a/code/datums/mood_events/needs_events.dm b/code/datums/mood_events/needs_events.dm index 4d8a397b73..5c36054768 100644 --- a/code/datums/mood_events/needs_events.dm +++ b/code/datums/mood_events/needs_events.dm @@ -59,4 +59,4 @@ /datum/mood_event/nice_shower description = "I have recently had a nice shower.\n" mood_change = 2 - timeout = 3 MINUTESS + timeout = 3 MINUTE diff --git a/code/datums/traits/good.dm b/code/datums/traits/good.dm index c023a4f180..be46a8aa21 100644 --- a/code/datums/traits/good.dm +++ b/code/datums/traits/good.dm @@ -171,8 +171,8 @@ H.regenerate_icons() /datum/quirk/bloodpressure - name = "Synthetic blood" - desc = "You've got a new form of synthetic blood that increases the total blood volume inside of you as well as the rate of replenishment!" + name = "Polycythemia vera" + desc = "You've a treated form of Polycythemia vera that increases the total blood volume inside of you as well as the rate of replenishment!" value = 1 //I honeslty dunno if this is a good trait? I just means you use more of medbays blood and make janitors madder, but you also regen blood a lil faster. mob_trait = TRAIT_HIGH_BLOOD gain_text = "You feel full of blood!" diff --git a/modular_citadel/code/datums/mood_events/generic_negative_events.dm b/modular_citadel/code/datums/mood_events/generic_negative_events.dm index 83ec1c8d23..2d03a7e990 100644 --- a/modular_citadel/code/datums/mood_events/generic_negative_events.dm +++ b/modular_citadel/code/datums/mood_events/generic_negative_events.dm @@ -3,12 +3,12 @@ /datum/mood_event/plushjack description = "I have butchered a plush recently.\n" mood_change = -1 - timeout = 2 MINUTESS + timeout = 2 MINUTE /datum/mood_event/plush_nostuffing description = "A plush I tried to pet had no stuffing...\n" mood_change = -1 - timeout = 2 MINUTESS + timeout = 2 MINUTE /datum/mood_event/emptypred description = "I had to let someone out.\n" diff --git a/modular_citadel/code/datums/mood_events/generic_positive_events.dm b/modular_citadel/code/datums/mood_events/generic_positive_events.dm index 971efdd7ca..3f9f405955 100644 --- a/modular_citadel/code/datums/mood_events/generic_positive_events.dm +++ b/modular_citadel/code/datums/mood_events/generic_positive_events.dm @@ -3,12 +3,12 @@ /datum/mood_event/headpat description = "Headpats are nice.\n" mood_change = 2 - timeout = 2 MINUTESS + timeout = 2 MINUTE /datum/mood_event/hugbox description = "I hugged a box of hugs recently.\n" mood_change = 1 - timeout = 2 MINUTESS + timeout = 2 MINUTE /datum/mood_event/plushpet description = "I pet a plush recently.\n"