cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-29 18:51:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
67,506 Commits 13 Branches 0 Tags
001b26fde0c8dfd9aaa33d6bac8fccc20415ca3b
Commit Graph

9927 Commits

Author SHA1 Message Date
Nadyr
001ca8885f Merge branch 'master' into upstream-merge-11848 2021-12-12 05:43:50 -05:00
Nadyr
b6e1741f11 Merge pull request #3447 from CHOMPStation2/upstream-merge-11842 
[MIRROR] SpaceVines - Now with 100% More Landmark Moments
 2021-12-12 05:39:43 -05:00
Nadyr
97270ba71c Merge pull request #3439 from CHOMPStation2/upstream-merge-11832 
[MIRROR] mechaport gaming
 2021-12-12 04:59:33 -05:00
Nadyr
5c2cdb3d5e Merge pull request #3433 from CHOMPStation2/upstream-merge-11821 
[MIRROR] Adds Altevian Language & ATC Fluff
 2021-12-12 04:46:37 -05:00
Nadyr
bb0392740f powder that makes you say yes 2021-12-12 04:23:10 -05:00
Nadyr
89168e2c7d powder that makes you say yes 2021-12-12 04:22:41 -05:00
Casey
5cefa8d4e3 department berets (mostly heads tbh) 2021-12-12 04:20:38 -05:00
Nadyr
d12a0f1b42 Merge pull request #3492 from CHOMPStation2/upstream-merge-11752 
[MIRROR] Renames Engineer, new alt-titles for Stellar Delight
 2021-12-12 04:13:36 -05:00
Nadyr
bf5f98c728 Merge pull request #3427 from CHOMPStation2/upstream-merge-11815 
[MIRROR] Adds catslug to maintpred options
 2021-12-12 04:13:27 -05:00
Casey
9163ddb85b Renames Engineer, new alt-titles for Stellar Delight 2021-12-12 08:46:53 +00:00
Nadyr
2cef388d77 Merge pull request #3424 from CHOMPStation2/upstream-merge-11812 
[MIRROR] Fixes invisible Heat Exchange Pipes
 2021-12-12 03:38:28 -05:00
Nadyr
d3c1d20387 Merge pull request #3413 from CHOMPStation2/upstream-merge-11797 
[MIRROR] Makes fuzzycuffs easier to get out of
 2021-12-12 02:34:31 -05:00
Nadyr
62921c7b1a Merge pull request #3401 from CHOMPStation2/upstream-merge-11779 
[MIRROR] Fixes infinite glass from low walls
 2021-12-12 02:00:08 -05:00
Nadyr
1bb3f74e41 Merge pull request #3339 from CHOMPStation2/upstream-merge-11768 
[MIRROR] Fixes a broken poster
 2021-12-11 18:29:48 -05:00
Razgriz
af8834894b powder that makes you say yes 2021-12-10 00:55:04 -07:00
CHOMPStation2
3145b5fe94 powder that makes you say yes 2021-12-09 23:58:53 -07:00
CHOMPStation2
b335832992 Merge pull request #3471 from CHOMPStation2/upstream-merge-11877 
[MIRROR] Adds leather gloves to (xeno)botanist lockers
 2021-12-09 23:42:06 -07:00
CHOMPStation2
b814b5a39f Merge pull request #3472 from CHOMPStation2/upstream-merge-11876 
[MIRROR] Fixes translocator beacon gulping grammar
 2021-12-09 23:41:24 -07:00
Casey
f58a3c742b Merge pull request #11881 from Heroman3003/grenadefix2 
Fixes infinite detonators being attachable to grenades
 2021-12-10 06:14:38 +00:00
Casey
0ab5dafa99 Merge pull request #11876 from Heroman3003/thebelly 
Fixes translocator beacon gulping grammar
 2021-12-10 06:12:19 +00:00
Casey
3d3fc07d0e Merge pull request #11877 from Heroman3003/glovening 
Adds leather gloves to (xeno)botanist lockers
 2021-12-10 06:12:10 +00:00
Casey
2484838ed4 EVENTS AND LANDMARKS - OH BOY MORE COMEDY 2021-12-10 05:19:50 +00:00
Casey
3b90133c20 SpaceVines - Now with 100% More Landmark Moments 2021-12-10 04:36:44 +00:00
Casey
e773ca01c9 Merge pull request #11832 from Hatterhat/pad-booster 
mechaport gaming
 2021-12-10 02:51:14 +00:00
Aronai Sieyes
4b2fa3836d Adds Altevian Language & ATC Fluff 2021-12-10 01:46:15 +00:00
Casey
afcf943138 Adds catslug to maintpred options 2021-12-10 01:08:04 +00:00
Casey
1dff5ee873 Fixes invisible Heat Exchange Pipes 2021-12-10 00:55:14 +00:00
Casey
cc72571da2 Merge pull request #11797 from R3dtail/patch-4 
Makes fuzzycuffs easier to get out of
 2021-12-09 23:07:51 +00:00
CHOMPStation2
8324777d6e Powder that makes you say yes 2021-12-09 14:16:10 -07:00
Casey
0d5546e11d Merge pull request #11768 from Heroman3003/posterfix2 
Fixes a broken poster
 2021-12-08 23:43:29 +00:00
Nadyr
680cffa88a Merge pull request #3211 from CHOMPStation2/upstream-merge-11928 
[MIRROR] Offmap Tweaks
 2021-12-05 14:04:20 -05:00
Nadyr
46c47164ce powder that makes you say yes 2021-12-05 13:47:04 -05:00
Nadyr
db3ef9440e Merge pull request #3217 from CHOMPStation2/upstream-merge-11921 
[MIRROR] Snakes are Sweet
 2021-12-05 13:28:39 -05:00
Nadyr
4efe4d49ef powder that makes you say yes 2021-12-05 12:53:32 -05:00
Nadyr
1dc06fd9e6 Merge branch 'master' into upstream-merge-11928 2021-12-05 12:50:21 -05:00
Nadyr
1d43637079 Merge pull request #3236 from CHOMPStation2/upstream-merge-11906 
[MIRROR] Fixes another active edge trigger potential
 2021-12-05 12:15:52 -05:00
Nadyr
f9a407ba4b powder that makes you say yes 2021-12-05 12:00:39 -05:00
Nadyr
72cdc6e878 Merge pull request #3244 from CHOMPStation2/upstream-merge-11894 
[MIRROR] Fixes some janky frame issues
 2021-12-05 11:04:47 -05:00
Nadyr
cc9fa9282c powder that makes you say yes 2021-12-05 10:53:54 -05:00
Nadyr
46e29ec6b6 powder that makes you say yes 2021-12-05 10:52:16 -05:00
Nadyr
a8490c5623 powder that makes you say yes 2021-12-05 09:27:14 -05:00
Casey
a1fabbfaa1 Snakes are Sweet 2021-12-03 07:15:09 +00:00
Casey
fe8c4753eb Offmap Tweaks 2021-12-03 07:14:17 +00:00
BlackMajor
55e8bfa69d Simulated you dingus 2021-11-15 12:18:42 +13:00
BlackMajor
44d8d3245e quick mapping tool pr 2021-11-15 12:16:05 +13:00
Chompstation Bot
0851b4f14c Takes Stellar Delight apart 2021-11-01 21:58:31 +00:00
Nadyr
19246dbed1 Merge pull request #3165 from CHOMPStationBot/upstream-merge-11722 
[MIRROR] Hardwood Material Port
 2021-10-30 23:30:40 -04:00
Chompstation Bot
da9e3383a8 Hardwood Material Port 2021-10-30 21:25:32 +00:00
Chompstation Bot
60de9a473c Stellar Delight! 2021-10-30 13:34:04 +00:00
Nadyr
4f36828e4c Merge pull request #3156 from CHOMPStationBot/upstream-merge-11615 
[MIRROR] [MIRROR] Remove suicide act
 2021-10-27 21:05:48 -04:00