cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-14 11:24:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,928 Commits 8 Branches 0 Tags
c4e7bb07e5e6742cb18448cb6a5ebd628aba1897
Commit Graph

6311 Commits

Author SHA1 Message Date
Nadyr
7f9bb6e91d powder that makes you say yes 2022-06-23 00:01:53 -04:00
Nadyr
0d15d88972 powder that makes you say yes 2022-06-23 00:01:30 -04:00
Casey
5788a26593 Input Fixes 2022-06-22 23:54:36 -04:00
Nadyr
b4c293749b Merge pull request #4399 from CHOMPStation2/upstream-merge-13136 
[MIRROR] pAI QOL
 2022-06-22 23:24:47 -04:00
Nadyr
f5aaf3ceb3 Merge pull request #4389 from CHOMPStation2/upstream-merge-13124 
[MIRROR] New pAI verb
 2022-06-22 23:00:32 -04:00
Nadyr
482c26da37 Merge branch 'master' into upstream-merge-13124 2022-06-22 22:47:53 -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
Darlantan
1cea8be6b4 powder that makes you say yes 2022-06-22 22:16:04 -04:00
Nadyr
e81e1f4faf Merge branch 'master' into upstream-merge-13112 2022-06-22 21:58:12 -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
5b75024c2f Merge branch 'master' into upstream-merge-13114 2022-06-22 21:47:19 -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
Casey
3d8594ff54 pAI QOL 2022-06-21 10:35:42 +00:00
Casey
9ba4b8a665 New pAI verb 2022-06-19 12:44:43 +00: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
d4f8e75cd6 Adds Happy carpet 2022-06-19 03:59:10 +00:00
Casey
54279fa4de [MIRROR] Adds Some More Decorative Flooring Types 2022-06-19 00:44:42 +00:00
Nadyr
fd9fe65610 Merge branch 'master' into upstream-merge-13063 2022-06-11 17:45:04 -04:00
Nadyr
80fe41605c Merge pull request #4339 from CHOMPStation2/upstream-merge-13056 
[MIRROR] Tiny PDA UI Fix & Communicator Changes
 2022-06-11 17:42:23 -04:00
Casey
a6c21a9adb Communicator Log Fix 2022-06-11 01:04:29 +00:00
Casey
cacb0de75a Tiny PDA UI Fix & Communicator Changes 2022-06-09 16:33:06 +00:00
Casey
9f53218332 Yet more pAI tweaks! 2022-06-07 03:38:57 +00:00
Nadyr
985216ba9e powder that makes you say yes 2022-06-06 18:25:13 -04:00
Casey
b249f87d8e Another pAI update 2022-06-05 22:02:24 +00:00
Nadyr
1d004e4bb8 Merge branch 'master' into upstream-merge-13038 2022-06-04 20:23:28 -04:00
Nadyr
ddc0c05b1f Merge pull request #4318 from CHOMPStation2/upstream-merge-13031 
[MIRROR] pAI and emote tweaks and upgrades
 2022-06-04 20:20:56 -04:00
Nadyr
4a04dddd7d Merge pull request #4303 from CHOMPStation2/upstream-merge-13014 
[MIRROR] Splits the scanners into separate files
 2022-06-04 20:20:27 -04:00
Nadyr
97af724389 powder that makes you say yes 2022-06-04 19:50:46 -04:00
Casey
3d5d4f1be8 Makes new pAI obtainable 2022-06-04 20:03:22 +00:00
Casey
f958518ea9 Merge pull request #13035 from lm40/nogods 
localizes religion and adds custom chaplain titles
 2022-06-04 16:38:53 +00:00
Casey
d3e0d8524c pAI and emote tweaks and upgrades 2022-06-04 10:00:21 +00:00
Casey
e5cb4ab052 Splits the scanners into separate files 2022-05-29 17:45:06 +00:00
Casey
61fce152d5 Merge pull request #12974 from foopwo/borgotoys 
Adds a couple of new toys for cyborgs.
 2022-05-15 20:15:29 +00:00
Casey
9f6a9a4e6a Merge pull request #12897 from FartMaster69420/cocoon 
Cocoon Metamorphosis
 2022-05-12 19:21:53 +00:00
Razgriz
c3fdc6d677 Merge pull request #4227 from CHOMPStation2/upstream-merge-12934 
[MIRROR] Chest -> Torso Targeting Fixes
 2022-05-11 10:04:45 -07:00
Novacat
0eaa4a68ea Merge pull request #12943 from ItsSelis/selis-patch-pai 
Allow numbers in pAI name
 2022-05-10 14:53:07 +00:00
Novacat
24aa127d67 Chest -> Torso Targeting Fixes 2022-05-09 01:08:04 +00:00
Nadyr
0ccf97a237 Merge pull request #4221 from CHOMPStation2/upstream-merge-12925 
[MIRROR] Adds chemistry kits
 2022-05-08 14:42:45 -04:00
Nadyr
de3c078fad Merge pull request #4199 from CHOMPStation2/upstream-merge-12898 
[MIRROR] Communicator Ringtones
 2022-05-08 14:42:29 -04:00
Nadyr
6c87352aa5 Merge pull request #4211 from CHOMPStation2/upstream-merge-12888 
[MIRROR] The pAI, Bot, and Microwave Tweaks
 2022-05-08 11:10:07 -04:00
Casey
16b58a8b18 Adds chemistry kits 2022-05-08 09:57:10 +00:00
Casey
fbd967128d Merge pull request #12888 from FartMaster69420/pai_and_bots 
The pAI, Bot, and Microwave Tweaks
 2022-05-08 09:46:55 +00:00
Casey
ff911924b5 Merge pull request #12881 from TankTheBirb/master 
Pocket pouch rebalance + obtaining method
 2022-05-08 09:44:33 +00:00
Novacat
5bffcf5062 Communicator Ringtones 2022-05-05 00:44:55 +00:00
Nadyr
19da7df9b5 Merge pull request #4192 from CHOMPStation2/upstream-merge-12861 
[MIRROR] Fixing Stack Deletion
 2022-05-01 18:17:18 -04:00