Commit Graph

2573 Commits

Author SHA1 Message Date
Nadyr
9764d2aae1 Merge pull request #4407 from CHOMPStation2/upstream-merge-13150
[MIRROR] Fixes more runtimes
2022-06-23 17:50:49 -04:00
Casey
79f5dc9c3f Merge pull request #13150 from Heroman3003/runtime-2
Fixes more runtimes
2022-06-23 10:43:41 +00:00
Casey
68c3469d60 ALL runtimes 2022-06-23 09:41:56 +00:00
Nadyr
25455698d0 powder that makes you say yes 2022-06-23 00:48:46 -04:00
Nadyr
062a886e2e powder that makes you say yes 2022-06-23 00:37:18 -04:00
Nadyr
4250675971 powder that makes you say yes 2022-06-23 00:34:21 -04:00
Nadyr
7400bb716f powder that makes you say yes 2022-06-23 00:33:20 -04:00
Nadyr
1b356c42ff powder that makes you say yes 2022-06-23 00:31:38 -04:00
Nadyr
b09b65859a powder that makes you say yes 2022-06-23 00:28:53 -04:00
Casey
5788a26593 Input Fixes 2022-06-22 23:54:36 -04:00
Nadyr
81b93b1aec powder that makes you say yes 2022-06-22 23:30:11 -04:00
Casey
8b49d2e997 Allows for toggling of display and editing of messages for Nutrition and Weight 2022-06-22 23:30:11 -04:00
Nadyr
482c26da37 Merge branch 'master' into upstream-merge-13124 2022-06-22 22:47:53 -04:00
Nadyr
a4cd470294 powder that makes you say yes 2022-06-22 22:33:01 -04:00
Nadyr
d4131c8712 Merge branch 'master' into upstream-merge-13121 2022-06-22 22:32:03 -04:00
Nadyr
e81e1f4faf Merge branch 'master' into upstream-merge-13112 2022-06-22 21:58:12 -04:00
Casey
9ba4b8a665 New pAI verb 2022-06-19 12:44:43 +00:00
Casey
9da1ee0ba4 Adjust Mass and Hide fixes 2022-06-19 11:08:26 +00:00
Casey
928a321b5f TGUI Input Conversions 2022-06-19 03:59:14 +00:00
Casey
22fdc88844 Merge pull request #13100 from Heroman3003/absorbfix
Fixes Absorbed Hold messages causing blank spaces to absorbed prey if you had none set
2022-06-19 00:59:16 +00:00
Casey
2be69cc835 Merge pull request #13073 from Very-Soft/resetcamera
Calls reset_view when entering and exiting holders and bellies
2022-06-12 16:07:32 +00:00
Nadyr
5ad9438589 Merge branch 'master' into upstream-merge-13059 2022-06-11 17:17:57 -04:00
Nadyr
d21ce03266 Merge pull request #4337 from CHOMPStation2/upstream-merge-13052
[MIRROR] Yet more pAI tweaks!
2022-06-11 17:10:12 -04:00
Casey
15fedaf44e pAI UI 2022-06-10 11:45:56 +00:00
Nadyr
0fab0e3779 powder that makes you say yes 2022-06-07 18:35:06 -04:00
Casey
9f53218332 Yet more pAI tweaks! 2022-06-07 03:38:57 +00:00
Casey
158674416f Merge pull request #13051 from Verkister/tallpreviews
Fixes setup previews for tall species
2022-06-07 03:35:41 +00:00
Nadyr
f1e581efe1 powder that makes you say yes 2022-06-06 18:29:44 -04:00
Casey
b249f87d8e Another pAI update 2022-06-05 22:02:24 +00:00
Nadyr
1c873bda73 powder that makes you say yes 2022-06-04 20:28:02 -04:00
Casey
9a67833bdc (badly) implements saved belly modes 2022-06-04 20:28:02 -04:00
Casey
75b08bb5c9 Merge pull request #13025 from lm40/master
Makes stomach noises save
2022-06-04 16:18:59 +00:00
Casey
8a2511e1b3 Merge pull request #13012 from stobarico/master
Stobarico's Fluff Item
2022-05-29 17:43:59 +00:00
Casey
a318b9be4c Merge pull request #13004 from TheDavestDave/amor-stuffs
custom item stuff ahead of explo removeal
2022-05-22 18:32:21 +00:00
Casey
c608a6b9bc Fixes dumb cat mistakes 2022-05-18 08:59:06 +00:00
Nadyr
9cafbc8dd0 powder that makes you say yes 2022-05-12 19:40:22 -04:00
Casey
a3b274487f Adds Nettie's fluff Tablet 2022-05-12 19:42:57 +00:00
Casey
20f95cb706 Merge pull request #12912 from Heroman3003/vertical-nom
Adds Vertical Nom trait
2022-05-08 09:54:44 +00:00
Nadyr
8401a17afe powder that makes you say yes 2022-05-01 18:21:11 -04:00
Casey
75c906e3d5 Fixes healbelly for synthmorphs draining nutrition forever 2022-05-01 05:08:37 +00:00
BlackMajor
720dbbe62c Merge branch 'master' into protean-rework 2022-04-27 20:45:38 +12:00
BlackMajor
6dc76ad03e More fixes etc 2022-04-25 23:27:24 +12:00
Casey
fd5a1d7ce2 Merge pull request #12820 from Heroman3003/slow_sizegun
Adds gradual sizegun
2022-04-24 07:16:37 +00:00
BlackMajor
15a01777d3 Even more fixes 2022-04-23 20:21:01 +12:00
BlackMajor
8d48097db0 tiny fix 2022-04-23 03:12:16 +12:00
BlackMajor
15ec60f86f Integration Tests, my beloved 2022-04-21 01:54:56 +12:00
BlackMajor
4285553f90 Merge branch 'master' into protean-rework 2022-04-21 01:18:45 +12:00
BlackMajor
c8909c037c Resident man embraces insanity, starts porting _ch files 2022-04-21 01:17:24 +12:00
Nadyr
3b8c48d027 Merge pull request #4122 from CHOMPStation2/upstream-merge-12793
[MIRROR] ACTUALLY updates the preferences
2022-04-18 22:37:00 -04:00
Nadyr
c96422d16b Merge pull request #4121 from CHOMPStation2/upstream-merge-12791
[MIRROR] Adjust default prefs
2022-04-18 22:36:26 -04:00