Commit Graph

43 Commits

Author SHA1 Message Date
Ghom
7616887604 Update mood.dm 2020-05-08 16:13:57 +02:00
Ghommie
835753a02d ! 2020-05-08 02:14:07 +02:00
Ghommie
60bdbfaf61 Merge conflicts, procs instead of macros, mood signals. 2020-05-08 02:12:41 +02:00
Ghommie
63870cc9d1 Movespeed modifiers refactor port. 2020-04-22 22:01:39 +02:00
Ghom
eb342d1591 Update mood.dm 2020-02-19 17:14:30 +01:00
Ghommie
ee1f61b5de F 2020-02-19 14:26:11 +01:00
Ghommie
057b6f591c HEEY 2020-02-19 14:23:12 +01:00
Ghommie
b39ae815f3 Porting several quirks code updates. 2019-12-13 16:12:04 +01:00
Ghommie
dd9116ee70 Ports elements: Lightweight shared/global components. 2019-11-28 01:47:20 +01:00
kevinz000
746bbccb9c Merge pull request #9723 from Ghommie/Ghommie-cit321
Riding component fix and hacky mood runtimes workaround.
2019-11-14 16:46:54 -07:00
Ghommie
7348693338 chucklefucks. 2019-11-12 15:53:54 +01:00
Ghommie
1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01:00
Ghommie
43014a8729 Riding component fix and hacky mood runtimes workaround. 2019-11-05 07:33:43 +01:00
Ghommie
cb74be29ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit262 2019-10-25 12:40:50 +02:00
BlackMajor
16998d8814 Merge pull request #9193 from Citadel-Station-13/kevinz000-patch-77
Disables crit_threshold changes through mood
2019-10-25 14:38:51 +13:00
Ghommie
c882c098cc Porting movespeed modification system updates. 2019-10-23 19:24:34 +02:00
Ghommie
6c34a51ff4 protip: don't return datum references anymore. 2019-10-23 15:47:10 +02:00
Ghommie
9cc480a5eb datum source. 2019-09-22 19:02:49 +02:00
Ghommie
3d0cb39e91 Removes revenant blight's shabby tox damage in favor of negative mood effects, and necropolis curse if not cured. 2019-09-22 18:42:47 +02:00
kevinz000
1e6845491d Update mood.dm 2019-08-26 19:54:34 -07:00
kevinz000
0eb1fdd9dc Update mood.dm 2019-08-25 11:19:01 -07:00
Fermi
be36a8bb33 Cleanup 2019-06-15 18:04:06 +01:00
Fermi
7a66039f0c Fixing merge errors.
Testmerge ready.
2019-06-14 21:55:17 +01:00
Fermi
6b9becce71 Merge branch 'pr/14' 2019-06-14 21:29:04 +01:00
Fermi
eab52a51e6 Fixed compile errors. 2019-06-13 03:05:34 +01:00
Fermi
463b4e19ec (var/mob/living/master = parent) fix 2019-06-13 01:01:19 +01:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Fermi
bb4aecbd5f Progressional fixes 2019-05-20 07:44:39 +01:00
Fermi
246a344fed Mreac fixed, tongue health, pH vars+ (drink, food, pryo, tox remain) 2019-05-16 00:58:30 +01:00
Fermi
ec2f33ceb5 Added Hatmium and a few slight fixes. 2019-05-12 03:42:23 +01:00
Fermi
ddad7a173d All compiling errors fixed!! I did it!! 2019-05-11 15:47:58 +01:00
Fermi
f7655cad25 All compiling errors fixed, except for a few weird ones that I need help 2019-05-11 15:40:06 +01:00
Fermi
6466ef562c 100 down, 66 to go. 2019-05-11 02:05:25 +01:00
Fermi
29d4a2fdde Finished MCchem, now to fix compling errors. 2019-05-11 00:14:04 +01:00
Poojawa
b6430559e9 datums 2018-09-11 02:49:41 -05:00
deathride58
3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
Jordan Brown
f0a259d3e5 Removes redundant COMPONENT_INCOMPATIBLE crashes 2018-04-25 05:54:41 -05:00
LetterJay
022ac2e6c3 Merge pull request #6178 from Citadel-Station-13/shit
sanity
2018-04-01 19:51:39 -05:00
kevinz000
84ac06c986 Yeah no 2018-03-31 04:07:29 -07:00
BeeSting12
cb8f3e9293 >happend 2018-03-28 12:17:14 -05:00
Qustinnus
79911d330a Being happy no longer makes you obese. (#36565)
* D O U B L E N E G A T I V E

* jesus
2018-03-21 15:35:33 -05:00
CitadelStationBot
dad2d44ea2 [MIRROR] [READY] Several fixes/changes to mood, longterm mood effects, beauty component (#5992)
* [READY] Several fixes/changes to mood, longterm mood effects, beauty component (#36344)

cl Floyd / Qustinnus
del: Removes short-term effects of mood
add; Adds long-term effects of mood by implementing sanity which goes up with good mood, down with bad mood, but takes time to change. Your sanity can be seen as your average mood in the recent past. All effects of moods are now covered by this system
add: Beauty component, currently only attached to cleanables, but you could attach it to any atom/movable and make them pretty/ugly, affecting mood of anyone in the room.
refactor: Removes the original way of adding mood events, uses signals properly instead.
fix: Cleanables "giving" area's free beauty during initialization
fix: Fixes some events not clearing properly
/cl

Fixes #36444

From now on mood no longer affects you directly, instead it decides whether your sanity goes up or down, when your sanity gets too low you will get the effects of what mood did before.

This means getting hit with bad moods due to being attacked while not mean you are doomed anymore, and you get a large timeframe to get away and just fix your mood later.

I also added the beauty component, you could add this to any object and it would either make a room prettier or uglier, comparable to DF or Rimworld. You could add traits to make certain people ugly, for example.

* [READY] Several fixes/changes to mood, longterm mood effects, beauty component
2018-03-19 21:33:18 -05:00
Qustinnus
a96a28f3d6 [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments] 2018-03-07 20:49:25 -06:00