cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
67,911 Commits 10 Branches 0 Tags
33403c6445b0a28d6e3ccf88897fedfe7934b56e
Commit Graph

1451 Commits

Author SHA1 Message Date
Nadyr
33403c6445 Merge branch 'master' into upstream-merge-12164 2022-02-06 21:38:32 -05:00
Nadyr
0a454b6c3d Merge pull request #3619 from CHOMPStation2/upstream-merge-12149 
[MIRROR] makes amour for lucky
 2022-02-06 21:02:24 -05:00
Casey
80e943716f talon miner 2022-02-06 23:21:47 +00:00
Casey
9379f4d1bc makes amour for lucky 2022-02-06 14:18:49 +00:00
Casey
6e4bebaf2a Merge pull request #12152 from Heroman3003/flavor-not-literally 
Adds extra advice to Flavor Text popup
 2022-02-06 14:18:40 +00:00
Casey
851dddd961 Merge pull request #12053 from TheDavestDave/dnd-fm 
Dnd fm
 2022-01-14 18:42:30 +00:00
Nadyr
97b91e21de Merge pull request #3525 from CHOMPStation2/upstream-merge-12044 
[MIRROR] Dnd explo amour
 2022-01-09 20:57:54 -05:00
Nadyr
439fc01c15 powder that makes you say yes 2022-01-09 20:49:33 -05:00
Casey
cd80228460 Merge pull request #11944 from Heroman3003/nifnerf 
Makes NIFs not get automatically lost (hopefully)
 2022-01-09 01:50:59 +00:00
Casey
c1b38449d9 Dnd explo amour 2022-01-09 01:50:02 +00:00
Nadyr
a18f0f082a Merge branch 'master' into upstream-merge-11990 2021-12-12 06:36:50 -05:00
Nadyr
604dbb1d52 Merge pull request #3336 from CHOMPStation2/upstream-merge-11875 
[MIRROR] Fixes bugs related to organic/synthetic exclusive traits disappearing
 2021-12-12 06:04:00 -05:00
Nadyr
8164226256 Merge pull request #3337 from CHOMPStation2/upstream-merge-11874 
[MIRROR] Adds prefs for Corgi and Cursed Sword roles
 2021-12-12 06:03:10 -05:00
Nadyr
58accf0791 powder that makes you say yes 2021-12-12 03:56:58 -05:00
Nadyr
63af8e82c1 powder that makes you say yes 2021-12-12 03:54:27 -05:00
Nadyr
f880a70a18 powder that makes you say yes 2021-12-12 03:53:42 -05:00
Nadyr
165b5681d7 powder that makes you say yes 2021-12-12 03:52:07 -05:00
Casey
9163ddb85b Renames Engineer, new alt-titles for Stellar Delight 2021-12-12 08:46:53 +00:00
Razgriz
3b86cb45c7 Merge pull request #3259 from CHOMPStation2/upstream-merge-11947 
[MIRROR] pastelprincedan & hatterhat fluff items
 2021-12-10 13:23:35 -07:00
Razgriz
064f1b1a20 Merge branch 'master' into upstream-merge-11935 2021-12-10 01:48:12 -07:00
Razgriz
de0d1ae244 powder that makes you say yes 2021-12-10 01:18:56 -07:00
Casey
3c89650556 Merge pull request #11755 from Hatterhat/gaiter-second-pass 
neck gaiter second pass - thank you @dan
 2021-12-10 06:24:31 +00:00
Casey
c8b2a0dc81 Brings back pre-fulp labcoat icons to loadout and vendors 2021-12-09 20:43:12 +00:00
Casey
f7fbce58c1 Merge pull request #11874 from Heroman3003/moreroleprefs 
Adds prefs for Corgi and Cursed Sword roles
 2021-12-08 22:49:16 +00:00
Casey
b2348a672b Merge pull request #11875 from Heroman3003/synthtrait 
Fixes bugs related to organic/synthetic exclusive traits disappearing
 2021-12-08 22:49:09 +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
5b4b80fcd4 Merge pull request #3218 from CHOMPStation2/upstream-merge-11920 
[MIRROR] Probably fixes xenowear loadout reset bug
 2021-12-05 13:10:10 -05:00
Nadyr
1dc06fd9e6 Merge branch 'master' into upstream-merge-11928 2021-12-05 12:50:21 -05:00
Nadyr
7399798406 Merge pull request #3222 from CHOMPStation2/upstream-merge-11931 
[MIRROR] Adds Amaryll's claws fluff item
 2021-12-05 12:40:51 -05:00
Nadyr
d9774a0ca2 Merge pull request #3233 from CHOMPStation2/upstream-merge-11909 
[MIRROR] Fixes loadout items with apostrophes not being adjustible
 2021-12-05 12:17:29 -05:00
Nadyr
aab7b6c936 powder that makes you say yes 2021-12-05 10:09:55 -05:00
Casey
dc39fe696f Merge pull request #11947 from PastelPrinceDan/fwuff 
pastelprincedan & hatterhat fluff items
 2021-12-04 01:28:44 +00:00
Casey
6004382872 Custom item for Coolcrow420, minor change to stamp code 2021-12-04 01:28:37 +00:00
Casey
3dfe2ff266 Merge pull request #11909 from Heroman3003/deencode 
Fixes loadout items with apostrophes not being adjustible
 2021-12-03 07:18:17 +00:00
Aronai Sieyes
a0cd42922e Adds Amaryll's claws fluff item 2021-12-03 07:16:14 +00:00
Casey
e8ef109999 Merge pull request #11920 from Verkister/patch-103 
Probably fixes xenowear loadout reset bug
 2021-12-03 07:15:35 +00:00
Casey
fe8c4753eb Offmap Tweaks 2021-12-03 07:14:17 +00:00
Nadyr
91a38b7532 Merge branch 'master' into upstream-merge-11716 2021-10-27 20:49:37 -04:00
Nadyr
b8e4821cb8 Merge pull request #3150 from CHOMPStationBot/upstream-merge-11715 
[MIRROR] neck gaiters, take two
 2021-10-27 20:47:26 -04:00
Nadyr
5623c20563 Merge pull request #3151 from CHOMPStationBot/upstream-merge-11712 
[MIRROR] Customverb tweak
 2021-10-27 20:30:04 -04:00
Nadyr
7f5305920d Merge branch 'master' into upstream-merge-11715 2021-10-27 20:25:43 -04:00
Nadyr
0a973e2ddd Merge pull request #3138 from CHOMPStationBot/upstream-merge-11698 
[MIRROR] Tool Time (Fixed)
 2021-10-27 19:14:36 -04:00
Nadyr
244db219b4 Merge pull request #3111 from CHOMPStationBot/upstream-merge-11643 
[MIRROR] Fixes the language reset bug
 2021-10-27 18:40:40 -04:00
Nadyr
4da0341c9b powder that makes you say yes 2021-10-27 18:28:54 -04:00
Chompstation Bot
04835a42c6 Straw Stuff + Fixes 2 2021-10-27 21:53:50 +00:00
Aronai Sieyes
891650aeea Merge pull request #11712 from KillianKirilenko/kk-misc2 
Customverb tweak
 2021-10-27 18:17:48 +00:00
Chompstation Bot
a4efe1b256 neck gaiters, take two 2021-10-27 17:40:59 +00:00
Chompstation Bot
0fc8ba9656 Tool Time (Fixed) 2021-10-27 16:02:47 +00:00
Casey
660f89f864 Merge pull request #11642 from PastelPrinceDan/mask 
paper masks, emotional mask
 2021-10-27 15:23:53 +00:00
Chompstation Bot
a14698561a Fixes the language reset bug 2021-10-27 15:23:46 +00:00