carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity
18,793 Commits
1 Branch
0 Tags
2.3 GiB
Commit Graph

572 Commits (ff7a54e842f5cfe77e4069c0879b78b631ece335)

Author SHA1 Message Date
Aevann1 20cc20d806 fsd 2022-05-21 14:36:22 +02:00
Aevann1 aed84df4ad fsd 2022-05-20 20:45:12 +02:00
Snakes c789f6923e Merge remote-tracking branch 'upstream/frost' into birthgay-staging 2022-05-19 17:59:35 -04:00
Snakes 69dec16f55 Shop badge discount: fix Spender, add Roller disc. 
The shop discount from Big Spender badges was incorrectly implemented:
intended behavior was for 2pp per badge. However, the values in
const.py were set as if a user could only have one Spender badge at
once, while user.py @ discount was implemented as if they were
additive. Since users factually do have multiple big spender badges,
the values in const were adjusted to reflect this fact.

Also, lootbox Roller badges now each offer a 1pp discount.
users.py @ discount was improved to check against the `discounts`
keys for appropriate badges, rather than a hardcoded list.
 2022-05-19 13:41:04 -04:00
Aevann1 45da8f0f35 sdf 2022-05-09 14:15:23 +02:00
Aevann1 b71ae6cc74 sf 2022-05-09 13:21:49 +02:00
Aevann1 f2039d7713 sfd 2022-05-07 06:13:19 +02:00
Aevann1 c5f5342373 sdf 2022-05-06 00:55:34 +02:00
Aevann1 2008bc76c1 cakedays 2022-05-05 01:31:11 +02:00
Aevann1 6b10d097a2 mn 2022-05-05 01:09:46 +02:00
Aevann1 5e2da5673c fsd 2022-05-03 06:28:42 +02:00
Aevann1 9eeb214a24 fsd 2022-05-02 03:45:22 +02:00
Aevann1 ccfbbba09a fsd 2022-05-02 03:42:59 +02:00
Aevann1 f59286b202 fsd 2022-05-02 03:41:08 +02:00
Aevann1 bc2a20cd4b sfd 2022-05-01 23:44:38 +02:00
Aevann1 a6b26ece67 fsd 2022-04-29 17:19:50 +02:00
Aevann1 d961ffc913 fds 2022-04-28 02:04:01 +02:00
Aevann1 957c97f2c7 sfd 2022-04-26 15:33:39 +02:00
Aevann1 0f05bf3f94 fsd 2022-04-26 00:28:20 +02:00
Aevann1 5c21180705 Revert "vxc" 
This reverts commit 4d0c7ba456.
 2022-04-25 23:59:12 +02:00
Aevann1 4d0c7ba456 vxc 2022-04-25 18:38:06 +02:00
Aevann1 c7d3401b62 fds 2022-04-18 00:47:30 +02:00
Aevann1 ee7063f70e fds 2022-04-16 01:28:02 +02:00
Aevann1 2e07356b3e vdvg 2022-04-16 01:21:30 +02:00
Aevann1 6a8eff8393 fds 2022-04-16 01:19:27 +02:00
Aevann1 99cb01d9fc fdsfds 2022-04-15 18:28:08 +02:00
Aevann1 a158c2b4ea fds 2022-04-14 19:29:53 +02:00
Aevann1 543b9a73cb rfds 2022-04-14 19:20:00 +02:00
Aevann1 b15786fb2b fds 2022-04-11 12:23:52 +02:00
Aevann1 51ebba5bca gf 2022-04-10 20:42:58 +02:00
Aevann1 30833f8130 fsd 2022-04-10 01:12:59 +02:00
Aevann1 16c16e28b2 fsd 2022-04-06 23:54:07 +02:00
Aevann1 3af80e37e9 fsd 2022-04-06 23:53:14 +02:00
Aevann1 cc2b6eb006 fsd 2022-04-05 21:08:06 +02:00
Aevann1 67d9629eac fds 2022-04-04 01:21:06 +02:00
Aevann1 724ef551fd dgf 2022-04-03 20:12:37 +02:00
Aevann1 2dd4e6a573 sfd 2022-04-03 20:08:59 +02:00
Aevann1 73af57f141 fsd 2022-04-03 20:05:11 +02:00
Aevann1 2d177ed1d8 spaghetti 2022-04-03 20:01:11 +02:00
Aevann1 2cb4d68267 fsd 2022-04-03 19:37:20 +02:00
Aevann1 7d9b0867c1 fds 2022-04-03 18:20:31 +02:00
Aevann1 7713fd891d fsd 2022-04-02 19:11:35 +02:00
Aevann1 b538d2a24c gdfg 2022-03-31 18:28:53 +02:00
Aevann1 6fc9de8278 deflector award 2022-03-24 00:42:33 +02:00
Aevann1 762f5c5acc gf 2022-03-21 23:46:10 +02:00
Aevann1 fbb30b8bcf fsd 2022-03-18 23:29:06 +02:00
Aevann1 e108147ce1 fds 2022-03-18 23:28:50 +02:00
Aevann1 83c88a9834 sfd 2022-03-17 18:30:13 +02:00
Aevann1 b99de4e936 fds 2022-03-09 04:26:05 +02:00
Aevann1 b35bab0672 hole 2022-03-09 04:04:37 +02:00
Aevann1 514d6ec126 right 2022-03-09 03:44:53 +02:00
Aevann1 b2c5cd93a5 fsd 2022-03-06 21:18:01 +02:00
Aevann1 fd5a0ae9ca subs toggle 2022-03-06 01:53:43 +02:00
Aevann1 770643b4a6 no more quadrants y'all cant behave 2022-03-06 00:16:40 +02:00
Aevann1 f58ce817f6 yeah yeah 2022-03-05 23:01:33 +02:00
Aevann1 ddc7f2d52d blegh 2022-03-05 23:00:01 +02:00
Aevann1 bf391394a8 bad PR 2022-03-05 22:53:39 +02:00
Aevann1 7d44f8456f uk 2022-03-05 21:46:47 +02:00
Aevann1 94f2a69167 N 2022-03-01 01:30:44 +02:00
Aevann1 1576fcd57d farts on u 2022-02-28 04:06:15 +02:00
Aevann1 e139f8d9ad fartin 2022-02-26 16:39:47 +02:00
Aevann1 6cc9cddef0 fug 2022-02-26 16:21:07 +02:00
Aevann1 06e496bc8f annoying 2022-02-26 15:31:49 +02:00
Aevann1 871ad7c6c8 fdfd 2022-02-25 15:26:56 +02:00
Aevann1 1d6190009d fd 2022-02-25 12:52:47 +02:00
Aevann1 14c7148eed fd 2022-02-24 10:28:13 +02:00
Aevann1 791fff3d37 fds 2022-02-24 04:52:46 +02:00
Aevann1 d93f2b2191 fds 2022-02-24 03:55:18 +02:00
Aevann1 8529839d7c cxvfd 2022-02-23 07:19:57 +02:00
Aevann1 5d4b09ef62 fd 2022-02-23 07:02:07 +02:00
Aevann1 fb9c0a23dc exiles 2022-02-16 06:33:13 +02:00
Aevann1 729e4a4c62 g 2022-02-16 03:16:01 +02:00
Aevann1 ec9797ff18 f 2022-02-16 00:54:17 +02:00
Aevann1 d75f70c431 Many to many (#210) 
* 8 legs of love

* 8 legs of love 2
 2022-02-14 14:25:44 -08:00
Aevann1 6e7bcb5694 gfd 2022-02-14 23:07:31 +02:00
Aevann1 315dcef46a hfg 2022-02-14 21:02:05 +02:00
Aevann1 6d71e8a73a vbc 2022-02-14 18:27:54 +02:00
Aevann1 dc696bf473 cvx 2022-02-14 03:22:26 +02:00
Aevann1 8db4b363f8 nb 2022-02-14 00:35:55 +02:00
Aevann1 bf3e14bba3 big big chungus big chungus big chungus 2022-02-13 03:08:12 +02:00
Aevann1 22eaa9e7f8 xvc 2022-02-13 01:10:29 +02:00
BuckFromRdrama 0da9c36a07 Show modded subs on userpage (#205) 
* show modded subs

* remove print lol

* added links
 2022-02-11 15:33:25 -08:00
Aevann1 97febe0080 big chungus commit 2022-02-12 01:32:14 +02:00
Aevann1 b9ea8a882f xvc 2022-02-11 20:32:39 +02:00
Aevann1 03f1a106b4 dude subdramas lmao 2022-02-10 22:35:16 +02:00
Aevann1 90fc18bcb8 xvc 2022-02-10 01:29:34 +02:00
Aevann1 8a37c6d118 vxc 2022-02-10 01:12:17 +02:00
Aevann1 c810421821 bv 2022-02-10 01:08:55 +02:00
Aevann1 09b9213a9a fds 2022-02-06 11:29:18 +02:00
Aevann1 fd7fce8ecb dsf 2022-02-06 00:31:11 +02:00
Aevann1 ff60c3c821 ffsd 2022-02-05 23:16:51 +02:00
Aevann1 1eeebf9400 crisis 2022-02-05 23:09:17 +02:00
Aevann1 dbdcb5d56b fds\ 2022-02-05 13:31:05 +02:00
Aevann1 9cde8a1688 fsd 2022-02-05 12:25:36 +02:00
Aevann1 b0b1b4650f hjg 2022-02-04 13:13:59 +02:00
Aevann1 492579d805 Bhm (#189) 
* Update user.py

* Update awards.py

* Update comments.py

* Update const.py

* Update awards.py

* Update user.py

* Update const.py

* Update awards.py

* Update comments.py

* use bhm banners

* bhm pfps (#194)

Co-authored-by: beese_buck <16601315+geese-suck@users.noreply.github.com>
Co-authored-by: geese_suck <16601315+cant-be-blenk@users.noreply.github.com>
 2022-01-31 20:20:31 -08:00
Aevann1 b0cd33dcf7 biggest money 2022-01-31 03:41:04 +02:00
Aevann1 7d5fc1b090 sdf 2022-01-30 15:40:11 +02:00
Aevann1 c831ca7d2e zxc 2022-01-29 15:57:55 +02:00
Aevann1 5f0b7d9ea7 dfs 2022-01-29 15:53:45 +02:00
Aevann1 e79fb81819 gdfdfg 2022-01-29 15:43:29 +02:00
Aevann1 380f23d356 xcv 2022-01-29 05:19:47 +02:00
Aevann1 951f873a91 fds 2022-01-29 04:48:34 +02:00
Aevann1 70813c686a dfs 2022-01-29 03:20:02 +02:00
Aevann1 c7bab4ec6c fsd 2022-01-28 23:42:09 +02:00
Aevann1 716b4ee2ea czx 2022-01-28 22:02:35 +02:00
Aevann1 0bd1afc70e fsd 2022-01-25 03:59:58 +02:00
Aevann1 c93070b213 bv 2022-01-24 23:38:03 +02:00
Aevann1 dedb9bbaa0 vc 2022-01-24 22:04:23 +02:00
Aevann1 b094e976dc cvvc 2022-01-24 18:49:23 +02:00
Aevann1 823a86b03e cvcv 2022-01-24 18:44:54 +02:00
Aevann1 9b4bd19c74 cxvxc 2022-01-22 18:37:58 +02:00
Aevann1 04f64d494d fdsfd 2022-01-22 18:36:01 +02:00
Aevann1 18a9903086 vxc 2022-01-21 13:55:53 +02:00
Aevann1 a1c94e8869 fds 2022-01-19 14:51:52 +02:00
Aevann1 81078c5877 fds 2022-01-19 11:07:16 +02:00
Aevann1 a16fd4989e df 2022-01-17 20:35:06 +02:00
Aevann1 45c80f01f9 1k 2022-01-17 17:03:51 +02:00
Aevann1 a93b2a1781 bb 2022-01-16 08:06:16 +02:00
Aevann1 db678ed227 bbb 2022-01-16 03:04:31 +02:00
Aevann1 700ade344e bbb 2022-01-16 02:54:04 +02:00
Aevann1 43e2aedbd2 bbbb 2022-01-15 08:01:39 +02:00
Aevann1 ebac7acaec bbb 2022-01-14 14:11:59 +02:00
Aevann1 6ecf15476a g 2022-01-14 01:29:15 +02:00
Aevann1 837410187c bbb 2022-01-13 23:15:36 +02:00
Aevann1 7c6397354e bb 2022-01-13 04:59:17 +02:00
Aevann1 999c24de4d bb 2022-01-13 04:35:00 +02:00
Aevann1 b5762b2e86 fv 2022-01-12 03:19:13 +02:00
Aevann1 a195489edf cc 2022-01-09 19:33:16 +02:00
Aevann1 101aa43006 fds 2022-01-06 22:30:08 +02:00
Aevann1 2c7a98e433 big one 2022-01-06 18:46:09 +02:00
Aevann1 c92c96b498 fds 2022-01-04 15:18:37 +02:00
Aevann1 6357a86ecf fds 2022-01-04 15:13:02 +02:00
kek7198 1ea0a03e8f fix 2022-01-02 19:54:13 -06:00
Aevann1 69f860aa4c fdsfsd 2022-01-02 23:09:48 +02:00
Aevann1 edc7f951d1 fsd 2022-01-02 20:03:51 +02:00
Aevann1 00e5e1c048 fsd 2022-01-02 02:06:46 +02:00
Aevann1 1f885af866 fd 2022-01-02 02:05:22 +02:00
Aevann1 29a8c604e1 big update 2022-01-01 01:45:27 +02:00
Aevann1 2797adc57a fdsfds 2021-12-29 08:43:20 +02:00
Aevann1 c31cf11a1f fds 2021-12-28 21:32:34 +02:00
Aevann1 702d528d4a fsd 2021-12-27 03:08:06 +02:00
Aevann1 c527d848ac sfd 2021-12-26 05:18:28 +02:00
Aevann1 39e0ad5cf9 sdf 2021-12-25 01:00:09 +02:00
Aevann1 eeae84ec15 sdffsd 2021-12-21 22:36:48 +02:00
Aevann1 3ee2c0749f dsfsdf 2021-12-21 22:03:13 +02:00
Aevann1 ac406b46ca fds 2021-12-21 17:07:28 +02:00
Aevann1 035ecf98d0 fsdfds 2021-12-21 01:56:48 +02:00
Aevann1 de21363ca6 fsdfds 2021-12-21 01:50:02 +02:00
Aevann1 4b49c3b927 dfsfsd 2021-12-20 00:57:50 +02:00
Aevann1 72d5d0a18a dfsfsd 2021-12-20 00:47:51 +02:00
Aevann1 99b05da1e6 fsdfsd 2021-12-20 00:46:53 +02:00
Aevann1 68bc992da1 sfdsdf 2021-12-19 15:01:28 +02:00
Aevann1 fbbae48405 fsddfs 2021-12-17 08:20:22 +02:00
Aevann1 0af51e3809 fsdfsd 2021-12-17 08:17:34 +02:00
Aevann1 7f9ef99ba2 fdsfsd 2021-12-17 07:08:40 +02:00
Aevann1 252c9303d8 sfdfds 2021-12-15 00:06:54 +02:00
Aevann1 de3b2fc3fb fsd 2021-12-14 23:08:18 +02:00
Aevann1 f163c662a4 fsdfsd 2021-12-12 22:12:19 +02:00
Aevann1 8cc67b2a95 fsdfsd 2021-12-12 22:00:02 +02:00
Aevann1 87098ff954 n word 2021-12-12 21:20:57 +02:00
Aevann1 838df002a7 dfssfd 2021-12-11 02:53:16 +02:00
Aevann1 1efc3aec63 dsfsfd 2021-12-11 01:29:35 +02:00
Aevann1 7ab42c991b fdssdf 2021-12-11 00:52:13 +02:00
Aevann1 33d44904b8 fdsfsd 2021-12-11 00:49:39 +02:00
Aevann1 a10b470695 fsdfds 2021-12-10 06:58:55 +02:00
Aevann1 76ead80d6d fsdfsd 2021-12-05 21:45:08 +02:00
Aevann1 6e54b9dccf sfddsf 2021-12-03 21:20:52 +02:00
Aevann1 b7522a5960 sdffsd 2021-12-03 20:10:24 +02:00
Aevann1 aee58baa90 fdssdf 2021-12-01 19:17:27 +02:00
Aevann1 0f0d27de15 dsfsff 2021-12-01 01:57:36 +02:00
Aevann1 0ce036e13a dfdf 2021-12-01 01:21:29 +02:00
Aevann1 9f62ea6351 fdfsd 2021-11-30 18:37:28 +02:00
Aevann1 c436424bd1 fdsfd 2021-11-30 16:23:34 +02:00
Aevann1 63f09542e5 fdsfds 2021-11-30 16:18:16 +02:00
Aevann1 2301b11e80 sdffds 2021-11-30 01:07:57 +02:00
Aevann1 c7a5d6e80a gd 2021-11-26 23:24:47 +02:00
Aevann1 aeea97941c 1 2021-11-26 21:28:55 +02:00
Aevann1 ea3b619e49 fsdfds 2021-11-24 22:50:00 +02:00
Aevann1 5e2d7f53f9 fdsfsd 2021-11-24 18:28:17 +02:00
Aevann1 a01835ed73 fdsfds 2021-11-24 18:21:22 +02:00
Aevann1 071ef274c6 sdffsd 2021-11-24 18:20:57 +02:00
Aevann1 f33b3a33b9 Merge pull request #103 from TheCaringCleaner/ban-links 
transform post/comment links in ban reason
 2021-11-24 08:02:53 -08:00
CaringCleaner ea5d69c561 8===============D 2021-11-24 15:50:35 +00:00
CaringCleaner 7fdf0ad348 8=====D 2021-11-24 15:33:41 +00:00
Aevann1 f9ce82fd21 dfssfd 2021-11-24 17:01:51 +02:00
Aevann1 a9a674ea6e fdssf 2021-11-24 16:50:22 +02:00
Aevann1 1339ffd757 fsddfs 2021-11-24 14:44:03 +02:00
Aevann1 4aed6490ec fdsfdsfd 2021-11-24 00:36:38 +02:00
Aevann1 694ffb4e83 badges 2021-11-21 19:40:47 +02:00
Aevann1 e99cc72a35 fd 2021-11-20 11:09:22 +02:00
CaringCleaner 05c33e163f teddit urls 2021-11-19 23:05:28 +00:00
Aevann1 8a7aa2e25e fdsfd 2021-11-18 22:50:03 +02:00
Aevann1 fceedfe94c fdfd 2021-11-18 22:02:26 +02:00
Aevann1 e09ea194bf fddf 2021-11-18 21:15:22 +02:00
Aevann1 c9a7bfd5a3 fdfd 2021-11-18 18:04:52 +02:00
Aevann1 65d2090cd8 fdsfsd 2021-11-18 16:21:19 +02:00
Aevann1 84fbcc9af5 fsdsfd 2021-11-18 15:54:21 +02:00
Aevann1 7eb3a556f9 fsdfsd 2021-11-16 01:53:42 +02:00
Aevann1 fde8ceb751 sfdfsd 2021-11-16 00:19:59 +02:00