Commit Graph

32516 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
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
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
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
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
74ea61bda1 powder that makes you say yes 2022-06-22 19:58:33 -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
03818cbf1f Merge pull request #4365 from CHOMPStation2/upstream-merge-13092
[MIRROR] Snailpilled update
2022-06-22 19:40:01 -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
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
7fd7c8f138 Merge pull request #4373 from CHOMPStation2/upstream-merge-12700
[MIRROR] TGUI Additions
2022-06-22 18:43:48 -04:00
Nadyr
f7edb1694e powder that makes you say yes 2022-06-22 18:20:29 -04:00
Casey
16eff45dba TGUI Additions 2022-06-22 18:18:12 -04:00
Casey
b0802ce267 More TGUI Input Conversions 2022-06-19 11:09:42 +00:00
Casey
928a321b5f TGUI Input Conversions 2022-06-19 03:59:14 +00:00
Casey
e84393199a TGUI Apostrophe Hotfix 2022-06-19 03:59:05 +00:00
Casey
5fac79aa3c Merge pull request #13104 from foopwo/tasey
Makes security cyborg taser cost the same charge as security's tasers.
2022-06-19 01:00:38 +00:00
Casey
5dfbb6dd3d Fixes tail layering bugs 2022-06-19 01:00:34 +00:00
Casey
6d3b309f12 Merge pull request #13109 from Heroman3003/voremob-above
Gives all voremobs 'nom from above' ability.
2022-06-19 01:00:29 +00:00
Casey
727fd44c86 Merge pull request #13099 from Heroman3003/ambiguity
Fixes ambigous genders being too ambigous
2022-06-19 00:59:23 +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
Novacat
47c92f2581 [MIRROR-FIX] Cooking QOL V2 2022-06-18 14:45:56 +00:00
Casey
c1187d1942 Various Fixes 2022-06-18 00:02:11 +00:00
Casey
6d793d6f3e Merge pull request #13092 from FunnyCatEnjoyer/FunnyCat2
Snailpilled update
2022-06-17 23:58:51 +00:00
Casey
6ebdb16c40 Merge pull request #13087 from VOREStation/upstream-merge-8650
[MIRROR] Adds fennec
2022-06-17 23:56:37 +00:00
Casey
c6b41d7658 [MIRROR] Tesh can into positronic 2022-06-17 23:21:24 +00:00
Casey
6a1bd853b1 Merge pull request #12259 from VOREStation/upstream-merge-8399
[MIRROR] Fixes tail layering over dresses/cloaks
2022-06-17 23:11:51 +00:00
Nadyr
1740fb34de Merge pull request #4355 from CHOMPStation2/upstream-merge-13079
[MIRROR] RCON Improvement
2022-06-15 20:32:13 -04:00
Nadyr
2538756a28 Merge pull request #4356 from CHOMPStation2/upstream-merge-13081
[MIRROR] adds vwag wolftaur fatness
2022-06-15 20:05:34 -04:00
Nadyr
43858732b8 Merge pull request #4352 from CHOMPStation2/upstream-merge-13078
[MIRROR] New pAI chassis
2022-06-15 19:47:05 -04:00
Nadyr
bd2b1827c2 Merge pull request #4350 from CHOMPStation2/upstream-merge-13073
[MIRROR] Calls reset_view when entering and exiting holders and bellies
2022-06-15 19:46:20 -04:00
Nadyr
7c3b78fc2f Merge pull request #4348 from CHOMPStation2/upstream-merge-13071
[MIRROR] pAI hud revision
2022-06-15 19:33:01 -04:00
Nadyr
a0c5c2dfb3 Merge pull request #4345 from CHOMPStation2/upstream-merge-13064
[MIRROR] Couple little fixes
2022-06-15 19:32:46 -04:00
Casey
048b8df8f1 Merge pull request #13081 from lm40/fat
adds vwag wolftaur fatness
2022-06-14 01:10:27 +00:00
Casey
42b6f8847c RCON Improvement 2022-06-14 01:10:21 +00:00
Casey
b3664852e4 Merge pull request #13078 from Very-Soft/newpaichassis
New pAI chassis
2022-06-12 21:15:58 +00:00