cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-09 16:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,285 Commits 10 Branches 0 Tags
c7a71bc5996fe35236c6910c1893aae66b1a2460
Commit Graph

66285 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aronai Sieyes
c7a71bc599 Merge pull request #11497 from VOREStation/upstream-merge-8239 
[MIRROR] Makes Fumo Un-Huge
 2021-08-26 17:38:41 +00:00
Nadyr
145f8172f4 Merge pull request #2843 from CHOMPStationBot/upstream-merge-11464 
[MIRROR] Stun Revolver Fix
 2021-08-25 23:42:35 -04:00
Nadyr
ed6c321187 Merge pull request #2891 from CHOMPStationBot/upstream-merge-11478 
[MIRROR] [MIRROR] Added tabloid magazines.
 2021-08-25 23:40:45 -04:00
Nadyr
454b7c25db Merge pull request #2889 from CHOMPStationBot/upstream-merge-11483 
[MIRROR] Adds the ability to ban people from ghost roles
 2021-08-25 23:38:36 -04:00
Nadyr
67eaef4886 Merge branch 'master' into upstream-merge-11464 2021-08-25 23:32:47 -04:00
Nadyr
8c2beb1ed3 Merge pull request #2883 from cadyn/upstream-merge-11434 
Merge Upstream Pull Request 11434
 2021-08-25 23:30:56 -04:00
Nadyr
085c3592e7 powder that makes you say yes 2021-08-25 23:30:35 -04:00
Nadyr
faba4dc825 powder that makes you say yes 2021-08-25 23:29:16 -04:00
Nadyr
a303176ce1 Merge pull request #2890 from CHOMPStationBot/upstream-merge-11486 
[MIRROR] Adds talon sprites for contractor IDs
 2021-08-25 23:25:24 -04:00
Nadyr
c989ded69f powder that makes you say yes 2021-08-25 23:25:00 -04:00
Nadyr
e4d8e5263e Merge branch 'master' into upstream-merge-11434 2021-08-25 23:19:08 -04:00
Nadyr
56d22684cc powder that makes you say yes 2021-08-25 23:18:21 -04:00
Nadyr
228cc8e096 powder that makes you say yes 2021-08-25 23:17:27 -04:00
Nadyr
4d023f33f1 powder that makes you say yes 2021-08-25 23:15:44 -04:00
Nadyr
10a2175fed Merge pull request #2879 from cadyn/upstream-merge-11427 
Merge Upstream Pull Request 11427
 2021-08-25 23:12:54 -04:00
Nadyr
b6e1e707b5 Merge pull request #2882 from cadyn/upstream-merge-11433 
Merge Upstream Pull Request 11433
 2021-08-25 23:09:35 -04:00
Nadyr
6662d7c6e5 Merge pull request #2878 from cadyn/upstream-merge-11426 
Merge Upstream Pull Request 11426
 2021-08-25 23:05:24 -04:00
Nadyr
266ac144be powder that makes you say yes 2021-08-25 23:02:16 -04:00
Nadyr
c19d6812a7 powder that makes you say yes 2021-08-25 22:51:50 -04:00
Nadyr
2797027a41 Merge branch 'master' into upstream-merge-11426 2021-08-25 22:49:43 -04:00
Nadyr
bbc75a8c28 Merge pull request #2877 from cadyn/upstream-merge-11425 
Merge Upstream Pull Request 11425
 2021-08-25 22:47:59 -04:00
Nadyr
6868e2fef7 Merge pull request #2876 from cadyn/upstream-merge-11424 
Merge Upstream Pull Request 11424
 2021-08-25 22:47:34 -04:00
Nadyr
f19dc1b2eb Merge pull request #2874 from cadyn/upstream-merge-11421 
Merge Upstream Pull Request 11421
 2021-08-25 22:38:53 -04:00
Nadyr
4514820882 powder that makes you say yes 2021-08-25 22:37:08 -04:00
Nadyr
77083e9210 Merge pull request #2873 from cadyn/upstream-merge-11417 
Merge Upstream Pull Request 11417
 2021-08-25 22:34:28 -04:00
Nadyr
c908563dec powder that makes you say yes 2021-08-25 22:28:33 -04:00
Nadyr
5c5591c16e powder that makes you say yes 2021-08-25 22:26:08 -04:00
Nadyr
8ebb7450a3 powder that makes you say yes 2021-08-25 22:18:11 -04:00
Nadyr
050f3d0bbb powder that makes you say yes 2021-08-25 22:12:30 -04:00
Nadyr
0d9cd50f72 powder that makes you say yes 2021-08-25 22:06:41 -04:00
Nadyr
93fa2d211d Merge pull request #2872 from cadyn/upstream-merge-11415 
Merge Upstream Pull Request 11415
 2021-08-25 22:03:43 -04:00
Nadyr
58bc4ed575 Merge pull request #2871 from cadyn/upstream-merge-11414 
Merge Upstream Pull Request 11414
 2021-08-25 22:02:55 -04:00
Nadyr
bd40a3b563 Merge pull request #2870 from cadyn/upstream-merge-11413 
Merge Upstream Pull Request 11413
 2021-08-25 22:02:09 -04:00
Nadyr
779c8ab9e6 Merge pull request #2869 from cadyn/upstream-merge-11412 
Merge Upstream Pull Request 11412
 2021-08-25 22:01:13 -04:00
Nadyr
a7970173a8 Merge pull request #2868 from cadyn/upstream-merge-11409 
Merge Upstream Pull Request 11409
 2021-08-25 22:00:55 -04:00
Nadyr
0d3076d6b4 Merge pull request #2867 from cadyn/upstream-merge-11408 
Merge Upstream Pull Request 11408
 2021-08-25 21:59:52 -04:00
Nadyr
e0b3a41696 powder that makes you say yes 2021-08-25 21:46:16 -04:00
Nadyr
e142d328ee powder that makes you say yes 2021-08-25 21:43:39 -04:00
Nadyr
0886de36ee powder that makes you say yes 2021-08-25 21:39:23 -04:00
Nadyr
bcee65aaa9 powder that makes you say yes 2021-08-25 21:33:25 -04:00
Nadyr
ae475104b5 powder that makes you say yes 2021-08-25 21:29:23 -04:00
Nadyr
ad5441a144 powder that makes you say yes 2021-08-25 21:25:20 -04:00
Nadyr
835c587224 Merge pull request #2866 from cadyn/upstream-merge-11404 
Merge Upstream Pull Request 11404
 2021-08-25 21:23:07 -04:00
Nadyr
103fe2c88d Merge pull request #2863 from cadyn/upstream-merge-11395 
Merge Upstream Pull Request 11395
 2021-08-25 20:35:18 -04:00
Chompstation Bot
03adfb863f [MIRROR] Added tabloid magazines. 2021-08-25 13:19:56 +00:00
Chompstation Bot
3d4a3e56d0 Adds talon sprites for contractor IDs 2021-08-25 13:19:49 +00:00
Novacat
5bcbbfd612 Merge pull request #11486 from Very-Soft/altcardupdate 
Adds talon sprites for contractor IDs
 2021-08-25 13:19:49 +00:00
Chompstation Bot
aba07d1109 Adds the ability to ban people from ghost roles 2021-08-25 13:18:40 +00:00
Novacat
ab680fd295 Upstream-11434 2021-08-24 21:11:09 -07:00
Cadyn
70cb5b372a Upstream-11433 2021-08-24 21:11:04 -07:00