cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,499 Commits 8 Branches 0 Tags
ed79946ade0b901b30e7c57b0c429a0db86bf16f
Commit Graph

2838 Commits

Author SHA1 Message Date
Casey
ecf834c452 Adds Linguist and Polyglot traits 2022-06-26 18:02:51 +00:00
Nadyr
e9e8fe478c powder that makes you say yes 2022-06-23 00:11:34 -04:00
Nadyr
38a40b6ef6 powder that makes you say yes 2022-06-23 00:11:10 -04:00
Nadyr
f179146e86 powder that makes you say yes 2022-06-23 00:10:47 -04:00
Nadyr
475883ccb3 powder that makes you say yes 2022-06-23 00:10:16 -04:00
Nadyr
189a9a8335 powder that makes you say yes 2022-06-23 00:09:29 -04:00
Nadyr
9ea487300d powder that makes you say yes 2022-06-23 00:08:37 -04:00
Nadyr
9a1e4434d8 powder that makes you say yes 2022-06-23 00:07:41 -04:00
Casey
5788a26593 Input Fixes 2022-06-22 23:54:36 -04:00
Nadyr
a2d9c8b58a Merge branch 'master' into upstream-merge-13122 2022-06-22 22:37:44 -04:00
Nadyr
6bd2ebdb93 powder that makes you say yes 2022-06-22 22:02:36 -04:00
Nadyr
e81e1f4faf Merge branch 'master' into upstream-merge-13112 2022-06-22 21:58:12 -04:00
Casey
a3dd6b8ffa TGUI Input Framework 2022-06-22 19:19:55 -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
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
6b54748ae6 powder that makes you say yes 2022-06-04 19:53:08 -04:00
Casey
3d5d4f1be8 Makes new pAI obtainable 2022-06-04 20:03:22 +00:00
Casey
45b9b743ef Merge pull request #13030 from ItsSelis/selis-byond-ui 
Adds Input (Hotkeys) Preference
 2022-06-04 16:30:29 +00:00
Casey
d3e0d8524c pAI and emote tweaks and upgrades 2022-06-04 10:00:21 +00:00
Nadyr
818157ccca Merge pull request #4302 from CHOMPStation2/upstream-merge-13012 
[MIRROR] Stobarico's Fluff Item
 2022-05-31 02:34:18 -04:00
Casey
8a2511e1b3 Merge pull request #13012 from stobarico/master 
Stobarico's Fluff Item
 2022-05-29 17:43:59 +00:00
Casey
bd6aa32092 Merge pull request #13011 from FunnyCatEnjoyer/FunnyCat 
Another typo on Fifi's fluff item. This time it should work.
 2022-05-29 17:41:48 +00:00
Nadyr
be2e7842b1 Merge branch 'master' into upstream-merge-12996 2022-05-27 16:08:25 -04:00
Nadyr
68a25ca178 Merge pull request #4280 from CHOMPStation2/upstream-merge-12997 
[MIRROR] Changes Schnapsen loadout description
 2022-05-27 16:07:29 -04:00
Nadyr
af6a481f51 Merge pull request #4278 from CHOMPStation2/upstream-merge-12994 
[MIRROR] Fixes typo in Fifi's fluff loadout
 2022-05-27 16:01:32 -04:00
Nadyr
c75225ef09 powder that makes you say yes 2022-05-27 15:51:56 -04:00
Nadyr
c94c50e953 powder that makes you say yes 2022-05-27 15:49:17 -04:00
Casey
62c04f34d1 Ports card icons from Eris. Implements them for VOREStation 2022-05-22 22:11:13 +00:00
Casey
a318b9be4c Merge pull request #13004 from TheDavestDave/amor-stuffs 
custom item stuff ahead of explo removeal
 2022-05-22 18:32:21 +00:00
Casey
3246c587a8 Changes Schnapsen loadout description 2022-05-22 18:22:42 +00:00
Casey
360c2f6308 Fixes typo in Fifi's fluff loadout 2022-05-22 18:17:22 +00:00
Razgriz
3e0cdf665b Merge branch 'master' into upstream-merge-12982 2022-05-18 13:31:31 -07:00
Casey
c608a6b9bc Fixes dumb cat mistakes 2022-05-18 08:59:06 +00:00
Casey
98fcb6f912 Merge pull request #12980 from FunnyCatEnjoyer/FunnyCatEnjoyer 
Adds the planet collar!
 2022-05-16 00:09:46 +00:00
Casey
a3b274487f Adds Nettie's fluff Tablet 2022-05-12 19:42:57 +00:00
Casey
fc2a9fe7ef Merge pull request #12906 from ItsSelis/selis-guestpass-patch 
Making "Walkpods" a loadout option
 2022-05-08 09:54:54 +00:00
Casey
87e00aff6f Merge pull request #12869 from ItsSelis/dosimeters 
Dosimeters
 2022-05-01 03:09:59 +00:00
TheGreatKitsune
8b58b4c2c0 Merge branch 'master' of https://github.com/CHOMPStation2/CHOMPStation2 into non-crew-role 2022-04-18 12:18:34 -05:00
Nadyr
84dddcc312 Merge pull request #4109 from CHOMPStation2/upstream-merge-12763 
[MIRROR] Verb Reset Buttons
 2022-04-18 00:31:46 -04:00
Nadyr
d45c7b7eed Merge branch 'master' into upstream-merge-12767 2022-04-17 23:33:35 -04:00
Casey
0b734943a3 Merge pull request #12763 from KillianKirilenko/kk-feedback 
Verb Reset Buttons
 2022-04-17 21:40:01 +00:00
Casey
c9eb919583 Big Pharma's Blessing: Snorting Mechanics 2022-04-17 21:17:05 +00:00
Casey
97cc55a948 Merge pull request #12749 from Runa-Dacino/schnapsen_final_final 
Adds a new playing card game: schnapsen
 2022-04-17 09:24:23 +00:00
Nadyr
543ca3c42c powder that makes you say yes 2022-04-04 18:07:58 -04:00
Casey
061b177978 Mini Aurora Port 2022-04-04 18:07:58 -04:00
Nadyr
d34ba3d49f Merge pull request #3990 from CHOMPStation2/upstream-merge-12578 
[MIRROR] The Grand /TG Port - Part 4
 2022-04-04 17:36:23 -04:00
Casey
5c33d6ea19 Merge pull request #12578 from GhostActual/tg-port-4 
The Grand /TG Port - Part 4
 2022-04-03 03:29:50 +00:00
Casey
94565a4770 Merge pull request #12607 from VOREStation/upstream-merge-8476 
[MIRROR] default client fps is 40 instead of match-server
 2022-04-03 02:21:12 +00:00