Commit Graph

69862 Commits

Author SHA1 Message Date
Nadyr
f20f331fd6 powder that makes you say yes 2022-06-22 22:43:27 -04:00
Nadyr
6a6399da3e powder that makes you say yes 2022-06-22 22:40:30 -04:00
Nadyr
a2d9c8b58a Merge branch 'master' into upstream-merge-13122 2022-06-22 22:37:44 -04:00
Nadyr
1b30469c6b Merge pull request #4383 from CHOMPStation2/upstream-merge-13114
[MIRROR] Adds Happy carpet
2022-06-22 22:33:37 -04:00
Nadyr
e69110c2f9 Merge pull request #4384 from CHOMPStation2/upstream-merge-13112
[MIRROR] TGUI Input Conversions
2022-06-22 22:19:26 -04:00
Darlantan
1cea8be6b4 powder that makes you say yes 2022-06-22 22:16:04 -04:00
Nadyr
738b23d400 powder that makes you say yes 2022-06-22 22:06:24 -04:00
Nadyr
6bd2ebdb93 powder that makes you say yes 2022-06-22 22:02:36 -04:00
Nadyr
441e02dc9a powder that makes you say yes 2022-06-22 22:01:17 -04:00
Nadyr
f520d5abf9 powder that makes you say yes 2022-06-22 21:59:47 -04:00
Nadyr
e81e1f4faf Merge branch 'master' into upstream-merge-13112 2022-06-22 21:58:12 -04:00
Nadyr
d7dcf390ff Merge pull request #4382 from CHOMPStation2/upstream-merge-13115
[MIRROR] TGUI Apostrophe Hotfix
2022-06-22 21:55:56 -04:00
Nadyr
46ff42c250 Merge pull request #4371 from CHOMPStation2/upstream-merge-13103
[MIRROR] [MIRROR-FIX] Cooking QOL V2
2022-06-22 21:55:19 -04:00
Darlantan
ea6e773537 powder that makes you say yes 2022-06-22 21:54:39 -04:00
Nadyr
5b75024c2f Merge branch 'master' into upstream-merge-13114 2022-06-22 21:47:19 -04:00
Nadyr
25e661e695 Merge branch 'master' into upstream-merge-13115 2022-06-22 21:07:57 -04:00
Nadyr
249bf75fd3 Merge pull request #4381 from CHOMPStation2/upstream-merge-13104
[MIRROR] Makes security cyborg taser cost the same charge as security's tasers.
2022-06-22 21:07:10 -04:00
Nadyr
03c4812145 Merge pull request #4368 from CHOMPStation2/upstream-merge-13094
[MIRROR] Various Fixes
2022-06-22 21:06:40 -04:00
Nadyr
5b120d091f powder that makes you say yes 2022-06-22 21:06:10 -04:00
Nadyr
552148de2f Merge pull request #4380 from CHOMPStation2/upstream-merge-13107
[MIRROR] Fixes tail layering bugs
2022-06-22 21:03:35 -04:00
Nadyr
c06c8f053f Merge branch 'master' into upstream-merge-13107 2022-06-22 20:51:09 -04:00
Nadyr
18c6797a58 Merge pull request #4379 from CHOMPStation2/upstream-merge-13109
[MIRROR] Gives all voremobs 'nom from above' ability.
2022-06-22 20:45:53 -04:00
Nadyr
4eb4f124c4 Merge pull request #4378 from CHOMPStation2/upstream-merge-13099
[MIRROR] Fixes ambigous genders being too ambigous
2022-06-22 20:45:31 -04:00
Nadyr
8c54964102 Merge pull request #4377 from CHOMPStation2/upstream-merge-13100
[MIRROR] Fixes Absorbed Hold messages causing blank spaces to absorbed prey if you had none set
2022-06-22 20:44:39 -04:00
Nadyr
d0857b1bf1 Merge pull request #4376 from CHOMPStation2/upstream-merge-12800
[MIRROR] [MIRROR] Adds Some More Decorative Flooring Types
2022-06-22 20:44:10 -04:00
Nadyr
5ad8019fb7 powder that makes you say yes 2022-06-22 20:43:20 -04:00
Nadyr
5096058348 powder that makes you say yes 2022-06-22 20:30:30 -04:00
Nadyr
c80dcd3976 powder that makes you say yes 2022-06-22 20:30:26 -04:00
Nadyr
c1bfb4b032 powder that makes you say yes 2022-06-22 20:10:07 -04:00
Nadyr
4f59070ba6 powder that makes you say yes 2022-06-22 20:07:25 -04:00
Nadyr
74ea61bda1 powder that makes you say yes 2022-06-22 19:58:33 -04:00
Nadyr
301264161b Merge pull request #4369 from CHOMPStation2/upstream-merge-13098
[MIRROR] Fenfix
2022-06-22 19:46:58 -04:00
Nadyr
b9cf38b348 Merge pull request #4375 from CHOMPStation2/upstream-merge-13108
[MIRROR] TGUI Input Framework
2022-06-22 19:44:43 -04:00
Nadyr
f0cab18ac0 powder that makes you say yes 2022-06-22 19:43:44 -04:00
Nadyr
d8d0af1e83 powder that makes you say yes 2022-06-22 19:42:55 -04:00
Nadyr
d639f8f4b4 Merge pull request #4366 from CHOMPStation2/upstream-merge-13093
[MIRROR] Fixes being able to reach for the sky
2022-06-22 19:40:42 -04:00
Nadyr
03818cbf1f Merge pull request #4365 from CHOMPStation2/upstream-merge-13092
[MIRROR] Snailpilled update
2022-06-22 19:40:01 -04:00
Nadyr
569c939e6b Merge pull request #4364 from CHOMPStation2/upstream-merge-13074
[MIRROR] Adding myself to the CODEOWNERS for TGUI
2022-06-22 19:39:15 -04:00
Nadyr
f69b763b54 Merge pull request #4363 from CHOMPStation2/upstream-merge-13087
[MIRROR] [MIRROR] Adds fennec
2022-06-22 19:38:47 -04:00
Darlantan
65a66b6566 bundle that makes you say yes 2022-06-22 19:23:39 -04:00
Nadyr
27e5c0aa52 Merge pull request #4361 from CHOMPStation2/upstream-merge-13086
[MIRROR] [MIRROR] Tesh can into positronic
2022-06-22 19:22:31 -04:00
Casey
a3dd6b8ffa TGUI Input Framework 2022-06-22 19:19:55 -04:00
Nadyr
f03af38227 Merge pull request #4374 from CHOMPStation2/upstream-merge-13106
[MIRROR] Removes tgui-panel
2022-06-22 19:17:01 -04:00
Casey
5e8703a6b1 Removes tgui-panel 2022-06-22 18:48:54 -04:00
Nadyr
7fd7c8f138 Merge pull request #4373 from CHOMPStation2/upstream-merge-12700
[MIRROR] TGUI Additions
2022-06-22 18:43:48 -04:00
Darlantan
03a92a4a6f bundle that makes you say yes 2022-06-22 18:20:57 -04:00
Nadyr
f7edb1694e powder that makes you say yes 2022-06-22 18:20:29 -04:00
Nadyr
9951decbb1 Merge pull request #4358 from CHOMPStation2/upstream-merge-12259
[MIRROR] [MIRROR] Fixes tail layering over dresses/cloaks
2022-06-22 18:19:15 -04:00
Casey
16eff45dba TGUI Additions 2022-06-22 18:18:12 -04:00
Nadyr
5d7a2a1f4e Merge pull request #4359 from CHOMPStation2/upstream-merge-13046
[MIRROR] tgui-bench Port
2022-06-22 18:01:08 -04:00