cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,047 Commits 5 Branches 0 Tags
ecf834c452ae2bf93b51e1ad9e42a69448308e0c
Commit Graph

10241 Commits

Author SHA1 Message Date
Nadyr
0c9b70b451 Merge pull request #4414 from CHOMPStation2/upstream-merge-13160 
[MIRROR] Account for Sleevecards and mild pAI use screen revamp
 2022-06-25 16:25:40 -04:00
Nadyr
aa0e710364 Merge pull request #4413 from CHOMPStation2/upstream-merge-13159 
[MIRROR] Fixes issues with taurs and belts/suits. Again.
 2022-06-25 16:23:19 -04:00
Nadyr
1080181d6b Merge pull request #4415 from CHOMPStation2/upstream-merge-13161 
[MIRROR] Fixes selectable item dupe bug
 2022-06-25 16:03:44 -04:00
Casey
2e7abb6af1 Merge pull request #13161 from Heroman3003/dupefix1 
Fixes selectable item dupe bug
 2022-06-25 07:12:05 +00:00
Casey
d607a8a3c5 Merge pull request #13160 from Very-Soft/accountforsleevecards 
Account for Sleevecards and mild pAI use screen revamp
 2022-06-25 02:31:55 +00:00
Casey
8dd5039119 Fixes issues with taurs and belts/suits. Again. 2022-06-25 02:23:35 +00:00
Casey
82ba349c54 Merge pull request #13152 from TankTheBirb/holster-pais 
pAIs can now be holstered!
 2022-06-24 00:02:04 +00:00
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
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
03c4812145 Merge pull request #4368 from CHOMPStation2/upstream-merge-13094 
[MIRROR] Various Fixes
 2022-06-22 21:06:40 -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
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
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
TheGreatKitsune
21ab8401e8 Add CHOMPEdit 2022-06-16 12:51:45 -05:00
TheGreatKitsune
5c32caa31c Girders now render above catwalks. 
And probably also a few other things like dirt/blood. But girders now render the same way that Grilles do as far as layers/planes are concerned.
 2022-06-12 22:42:45 -05: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
457df85c54 Merge pull request #4333 from CHOMPStation2/upstream-merge-13043 
[MIRROR] Another pAI update
 2022-06-06 18:41:35 -04:00
Nadyr
985216ba9e powder that makes you say yes 2022-06-06 18:25:13 -04:00
Nadyr
5d5eb0bc46 powder that makes you say yes 2022-06-06 18:23:51 -04:00
Casey
b249f87d8e Another pAI update 2022-06-05 22:02:24 +00:00
Casey
d251046e35 Brings fairness back to holodeck 2022-06-05 21:51:51 +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