cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 12:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,759 Commits 8 Branches 0 Tags
64e7ac79d621c9e7b665f23f1e0b93a898d35331
Commit Graph

47910 Commits

Author SHA1 Message Date
Casey
64e7ac79d6 Merge pull request #13071 from Very-Soft/pAIUI 
pAI hud revision
 2022-06-12 01:34:02 +00:00
Nadyr
fd9fe65610 Merge branch 'master' into upstream-merge-13063 2022-06-11 17:45:04 -04:00
Nadyr
71d5dbe531 Merge pull request #4342 from CHOMPStation2/upstream-merge-13059 
[MIRROR] pAI UI
 2022-06-11 17:43:29 -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
Nadyr
10d7803952 Merge pull request #4341 from CHOMPStation2/upstream-merge-13057 
[MIRROR] Adds fat draketaur sprites from CHOMPStation
 2022-06-11 17:30:17 -04:00
Nadyr
67546249cf powder that makes you say yes 2022-06-11 17:27:58 -04:00
Nadyr
a9117b84a3 Merge pull request #4346 from CHOMPStation2/upstream-merge-13066 
[MIRROR] Make vchat warning only fire if vchat is enabled
 2022-06-11 17:21:16 -04:00
Nadyr
5ad9438589 Merge branch 'master' into upstream-merge-13059 2022-06-11 17:17:57 -04:00
Nadyr
928c7ff904 powder that makes you say yes 2022-06-11 17:15:12 -04:00
Nadyr
911951b0d6 Merge pull request #4340 from CHOMPStation2/upstream-merge-13055 
[MIRROR] Alraune language update
 2022-06-11 17:11:36 -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
1f9b3f8f13 Merge pull request #13066 from Very-Soft/vchatwarning 
Make vchat warning only fire if vchat is enabled
 2022-06-11 07:29:25 +00:00
Casey
a6c21a9adb Communicator Log Fix 2022-06-11 01:04:29 +00:00
Casey
15fedaf44e pAI UI 2022-06-10 11:45:56 +00:00
Casey
3ce91cdb8b Merge pull request #13057 from JoltDerg/master 
Adds fat draketaur sprites from CHOMPStation
 2022-06-10 11:40:40 +00:00
Casey
85e4ad0e0a Merge pull request #13055 from liache/patch-1 
Alraune language update
 2022-06-09 16:33:12 +00:00
Casey
cacb0de75a Tiny PDA UI Fix & Communicator Changes 2022-06-09 16:33:06 +00:00
Nadyr
b204735fa2 Merge pull request #4338 from CHOMPStation2/upstream-merge-13053 
[MIRROR] Because we can't have anything fun
 2022-06-07 18:36:59 -04:00
Nadyr
0fab0e3779 powder that makes you say yes 2022-06-07 18:35:06 -04:00
Nadyr
dc184eecae powder that makes you say yes 2022-06-07 18:32:57 -04:00
Nadyr
9695c2173d powder that makes you say yes 2022-06-07 18:32:11 -04:00
Casey
d5e3720363 Merge pull request #13053 from Very-Soft/canthaveanythingfun 
Because we can't have anything fun
 2022-06-07 03:42:10 +00: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
457df85c54 Merge pull request #4333 from CHOMPStation2/upstream-merge-13043 
[MIRROR] Another pAI update
 2022-06-06 18:41:35 -04:00
Nadyr
382895aa7c Merge pull request #4330 from CHOMPStation2/upstream-merge-13041 
[MIRROR] Brings fairness back to holodeck
 2022-06-06 18:37:55 -04:00
Nadyr
42a8a93f54 Merge pull request #4327 from TheGreatKitsune/simplemob_sizeandcolor_verbs 
Adds pick size and pick color verbs
 2022-06-06 18:37:18 -04:00
Nadyr
b385f3e85d Merge pull request #4296 from TheGreatKitsune/increasing-communication 
Fixes for two communication bugs and feature added for ghosts in belly
 2022-06-06 18:34:44 -04:00
Nadyr
85d880a79c Merge pull request #4334 from TheGreatKitsune/emote-pitch-pref 
Add preference for variable pitch emotes
 2022-06-06 18:32:07 -04:00
Nadyr
f1e581efe1 powder that makes you say yes 2022-06-06 18:29:44 -04:00
Nadyr
97db4ae9a4 powder that makes you say yes 2022-06-06 18:27:06 -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
TheGreatKitsune
00fa8ea63e Add preference for variable pitch emotes 2022-06-05 22:44:12 -05:00
Casey
b249f87d8e Another pAI update 2022-06-05 22:02:24 +00:00
Casey
1e7c0c6685 More TGUI Maintenance 2022-06-05 21:59:09 +00:00
Casey
d251046e35 Brings fairness back to holodeck 2022-06-05 21:51:51 +00:00
TheGreatKitsune
2c58f369df Fixes ghosts seeing subtles from their pred 2022-06-04 20:35:01 -05:00
Nadyr
b0b0ec8bc4 Merge pull request #4326 from CHOMPStation2/upstream-merge-13028 
[MIRROR] (badly) implements saved belly modes
 2022-06-04 20:55:24 -04: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
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
78312516ba Merge pull request #4320 from CHOMPStation2/upstream-merge-13026 
[MIRROR] Fix Telecomms machine browser and log browser.
 2022-06-04 20:02:28 -04:00
Nadyr
687c534cc2 Merge pull request #4323 from CHOMPStation2/upstream-merge-13035 
[MIRROR] localizes religion and adds custom chaplain titles
 2022-06-04 19:59:35 -04:00
Nadyr
623af572ac Merge pull request #4321 from CHOMPStation2/upstream-merge-13030 
[MIRROR] Adds Input (Hotkeys) Preference
 2022-06-04 19:57:32 -04:00
Nadyr
4ee2427aaf powder that makes you say yes 2022-06-04 19:54:56 -04:00
Nadyr
6b54748ae6 powder that makes you say yes 2022-06-04 19:53:08 -04:00
Nadyr
97af724389 powder that makes you say yes 2022-06-04 19:50:46 -04:00