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

451 Commits (8075c5e81ff1f4a4ba232a44f7f1585856b783cb)

Author SHA1 Message Date
Aevann1 4c112b1edb dsf 2022-05-27 23:31:02 +02:00
Aevann1 66b3efab36 award refactor 2022-05-27 01:08:23 +02:00
Aevann1 957cf5ba8f dfs 2022-05-26 20:09:44 +02:00
Aevann1 163267c88c Revert "Add Y'all Seein' Eye award." 
This reverts commit a0f441a67d.
 2022-05-26 02:51:42 +02:00
Snakes a0f441a67d Add Y'all Seein' Eye award. 
Adds award to enable viewing profile visitors for non-mops and
non-patrons. This commit should encompass all frontend, backend, and
database changes necessary. Perhaps usable as a model for other
user upgrade flag awards.
 2022-05-25 19:44:34 -04:00
Aevann1 94151bf2d6 fsd 2022-05-25 21:45:03 +02:00
Aevann1 5548160912 fsd 2022-05-20 00:56:53 +02:00
Snakes c789f6923e Merge remote-tracking branch 'upstream/frost' into birthgay-staging 2022-05-19 17:59:35 -04:00
Snakes 289a00c302 Lootboxes: remove notification to Carp. 2022-05-18 17:33:40 -04:00
Snakes b51ab09b27 Lootboxes: re-enable for birthgay, improve. 
Re-enable lootboxes in const.py, and update their contents in
awards.py. Additionally, improve appearance in shop.

Upon purchasing a lootbox, users now receive a message informing
them of the contents thereof.

Lootbox backend now properly uses CARP_ID (and checks for the
existence thereof correctly).

Also, minor changes to how const.py whitelists awards.
 2022-05-17 22:10:04 -04:00
Aevann1 9bd8fcbd1c sf 2022-05-10 09:20:49 +02:00
Aevann1 6b10d097a2 mn 2022-05-05 01:09:46 +02:00
Aevann1 47d01ed00b vb 2022-05-03 04:15:35 +02:00
Aevann1 ac4da7516d fsdfds 2022-04-22 15:23:56 +02:00
Aevann1 9c0441aef9 fsd 2022-04-17 23:46:29 +02:00
Aevann1 2abddddc30 fsd 2022-04-15 17:05:19 +02:00
Aevann1 752c974c72 fsd 2022-04-14 19:31:45 +02:00
Aevann1 e6c0044d35 fart 2022-04-10 02:37:45 +02:00
Aevann1 15a02cf3cd fds 2022-04-10 01:07:03 +02:00
Aevann1 77175051ac gd 2022-04-07 01:50:32 +02:00
Aevann1 cc2b6eb006 fsd 2022-04-05 21:08:06 +02:00
Aevann1 f1fdeb866c fsd 2022-04-05 20:41:54 +02:00
Aevann1 8baefa2572 fsd 2022-04-03 18:08:54 +02:00
Aevann1 322e87db72 fds 2022-04-01 15:27:01 +02:00
Aevann1 79b92cf8b3 fsd 2022-03-29 20:24:09 +02:00
Aevann1 37d5003af4 bbbbbbbbbbbbb 2022-03-27 15:39:21 +02:00
Aevann1 e677dd0514 fsd 2022-03-24 02:59:54 +02:00
Aevann1 de577db8fe gf 2022-03-24 00:57:31 +02:00
Aevann1 a6a07f8143 delfector 2 2022-03-24 00:49:18 +02:00
Aevann1 6fc9de8278 deflector award 2022-03-24 00:42:33 +02:00
Aevann1 329f34a6e6 pizza 2022-03-17 18:12:59 +02:00
Aevann1 de6cebe659 aw 2022-03-17 10:59:44 +02:00
Aevann1 514d6ec126 right 2022-03-09 03:44:53 +02:00
Aevann1 94f2a69167 N 2022-03-01 01:30:44 +02:00
Aevann1 8ce15e6c61 fds 2022-02-28 02:14:53 +02:00
Aevann1 0995f70eb3 fd 2022-02-28 02:13:07 +02:00
Aevann1 18fb196922 permenantly 2022-02-25 19:25:31 +02:00
Aevann1 4f7d207260 fds 2022-02-24 15:20:48 +02:00
Aevann1 7c90b95880 fds 2022-02-23 07:32:19 +02:00
Aevann1 5871c6106e vc 2022-02-22 13:43:38 +02:00
Aevann1 13e575a6b5 fgh 2022-02-19 23:42:55 +02:00
Aevann1 90756ac07a nvb 2022-02-18 22:38:07 +02:00
Aevann1 4055fa2638 xvc 2022-02-18 10:45:36 +02:00
Aevann1 a535c7d2df v 2022-02-18 10:01:21 +02:00
Aevann1 fb9c0a23dc exiles 2022-02-16 06:33:13 +02:00
Aevann1 b46978d537 gf 2022-02-16 04:15:17 +02:00
Aevann1 f1fbb733fa f 2022-02-16 01:24:13 +02:00
Aevann1 ed3a7b9d71 df 2022-02-16 01:14:50 +02:00
Aevann1 891afa54ed fd 2022-02-15 02:18:54 +02:00
Aevann1 de4e019abc sfd 2022-02-13 23:25:09 +02:00
Aevann1 22eaa9e7f8 xvc 2022-02-13 01:10:29 +02:00
Aevann1 97febe0080 big chungus commit 2022-02-12 01:32:14 +02:00
Aevann1 b036390fea vx 2022-02-08 11:39:41 +02:00
Aevann1 ef64860c40 fsd 2022-02-04 04:25:42 +02:00
Aevann1 b70cf702b6 f 2022-02-02 02:06:29 +02:00
BuckFromRdrama eddbf6726d Shop discount QoL (#195) 2022-02-01 14:59:57 -08:00
Aevann1 f9f918dfd8 fd 2022-02-01 18:12:43 +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 951f873a91 fds 2022-01-29 04:48:34 +02:00
Aevann1 cabb0a49e8 vcvc 2022-01-27 22:25:48 +02:00
Aevann1 5bf6fd1e0d vcx 2022-01-25 05:16:41 +02:00
Aevann1 0a06937147 f 2022-01-25 01:49:02 +02:00
Aevann1 e493592a23 vc 2022-01-24 22:26:15 +02:00
Aevann1 8956f37bc0 cxvdf 2022-01-24 20:01:15 +02:00
Aevann1 25d9419388 vcvc 2022-01-24 19:37:37 +02:00
Aevann1 8c3066016e vcx 2022-01-24 03:20:29 +02:00
Aevann1 594fbfd41c vcxxcv 2022-01-23 18:54:57 +02:00
Aevann1 9c1c225ed9 cxzxzc 2022-01-22 12:14:15 +02:00
Aevann1 9a04ca8def vxcvxc 2022-01-22 02:02:58 +02:00
Aevann1 5f9c17754c vxccxv 2022-01-22 01:59:48 +02:00
Aevann1 7d4c959c47 xcvxvcvxc 2022-01-22 01:59:39 +02:00
Aevann1 92b0d45bec cvxxc 2022-01-22 01:58:01 +02:00
Aevann1 0f58d70cce 100000000k 2022-01-19 08:20:05 +02:00
Aevann1 7812ceb338 sfd 2022-01-19 07:09:28 +02:00
Aevann1 6df9369d60 fdsfds 2022-01-17 23:26:03 +02:00
Aevann1 a8d5522382 bvv 2022-01-17 22:29:06 +02:00
Aevann1 7b2a217830 vc 2022-01-17 20:38:15 +02:00
Aevann1 202c20a964 ggf 2022-01-17 20:20:42 +02:00
Aevann1 b617163a1c vvv 2022-01-17 13:06:12 +02:00
Aevann1 8ed146a733 bbbbbbbbbbbbbbbb 2022-01-16 03:47:21 +02:00
Aevann1 2b6418a132 testing 2022-01-15 08:31:17 +02:00
Aevann1 3ab53cad82 b 2022-01-14 14:04:35 +02:00
Aevann1 b5762b2e86 fv 2022-01-12 03:19:13 +02:00
Aevann1 d0528c0431 bbb 2022-01-11 02:11:34 +02:00
Aevann1 b69199054c under attack 2022-01-09 17:15:02 +02:00
Aevann1 d0f3ae65e5 sfd 2022-01-07 23:03:14 +02:00
Aevann1 8a0d51c4e0 cvxx 2022-01-07 21:13:01 +02:00
Aevann1 1eda3802a9 fds 2022-01-07 03:39:07 +02:00
Aevann1 b0d56b91ef fds 2022-01-07 00:28:27 +02:00
Aevann1 2c7a98e433 big one 2022-01-06 18:46:09 +02:00
Aevann1 1c8f30ec1e fds 2022-01-03 12:32:31 +02:00
Aevann1 47bd01eaa6 fdsfsd 2022-01-02 20:29:24 +02:00
Aevann1 633a7131e3 fdsfs 2022-01-02 20:25:24 +02:00
Aevann1 ab3ec6a158 fdsfds 2022-01-02 19:13:51 +02:00
Aevann1 20c3bf0185 fdsfds 2022-01-02 19:13:21 +02:00
Aevann1 e5d8c6e5ed dfs 2022-01-02 14:10:01 +02:00
Aevann1 11e4cfc5f7 fds 2022-01-02 02:26:34 +02:00
Aevann1 00e5e1c048 fsd 2022-01-02 02:06:46 +02:00
Aevann1 1a23f75d0a fdsdsf 2022-01-02 00:51:39 +02:00
Aevann1 aaee13708d fsd 2022-01-01 22:20:15 +02:00
Aevann1 29a8c604e1 big update 2022-01-01 01:45:27 +02:00
Aevann1 89798803af dfs 2021-12-30 07:27:22 +02:00
Aevann1 9222d8d8fd sfd 2021-12-28 21:32:32 +02:00
Aevann1 ed9184028d fds 2021-12-28 15:51:26 +02:00
Aevann1 852b164b3c fsd 2021-12-27 05:32:35 +02:00
Aevann1 bb182a0807 fds 2021-12-27 04:09:06 +02:00
Aevann1 702d528d4a fsd 2021-12-27 03:08:06 +02:00
Aevann1 1279734995 dfsfds 2021-12-26 04:29:01 +02:00
Aevann1 19bacd8357 pins logic rework 2021-12-26 03:03:21 +02:00
Aevann1 9199411339 fds 2021-12-21 09:59:24 +02:00
Aevann1 12904050a1 fdssdf 2021-12-20 23:04:15 +02:00
Aevann1 4135175d8a fdssfd 2021-12-20 22:03:59 +02:00
Aevann1 efff0400ef fsfs 2021-12-20 02:27:25 +02:00
Aevann1 68bc992da1 sfdsdf 2021-12-19 15:01:28 +02:00
Aevann1 2357c422ba fdsfsd 2021-12-16 20:12:26 +02:00
Aevann1 b8350f1aba fsdsfd 2021-12-15 21:30:26 +02:00
Aevann1 1681f65eec fsdfsd 2021-12-15 00:26:14 +02:00
Aevann1 ed74bd794d dggfd 2021-12-15 00:26:00 +02:00
Aevann1 3e3278ba8b fdsfds 2021-12-15 00:08:48 +02:00
Aevann1 252c9303d8 sfdfds 2021-12-15 00:06:54 +02:00
Aevann1 cc02d8b764 fdsfsd 2021-12-14 23:55:19 +02:00
Aevann1 7a4888ebb6 fdsfsd 2021-12-14 23:44:37 +02:00
Aevann1 de3b2fc3fb fsd 2021-12-14 23:08:18 +02:00
Aevann1 f3cf087e8e fsdsfd 2021-12-14 22:57:25 +02:00
Aevann1 443f3581d2 fdsfd 2021-12-14 22:48:49 +02:00
Aevann1 481af28e35 fdsfsd 2021-12-14 22:25:57 +02:00
Aevann1 96362089da fdsfds 2021-12-10 20:17:58 +02:00
Aevann1 a75929a96f fsddfs 2021-12-10 18:28:16 +02:00
Aevann1 6b4a080be0 fdsfds 2021-12-10 07:09:24 +02:00
Aevann1 1fc72f0c33 fdsfds 2021-12-10 07:01:10 +02:00
Aevann1 86cd91ceba fdsfd 2021-12-10 07:00:58 +02:00
Aevann1 a10b470695 fsdfds 2021-12-10 06:58:55 +02:00
Aevann1 5204cfaab2 fdsdfs 2021-12-10 06:16:53 +02:00
Aevann1 edca73723a sfdsfd 2021-12-09 23:21:52 +02:00
Aevann1 a60b658a90 fdfsdsd 2021-12-09 22:12:21 +02:00
Aevann1 3634fed841 fsfs 2021-12-08 01:18:06 +02:00
Aevann1 81a6bcfdc0 fsdfsd 2021-12-04 22:48:10 +02:00
Aevann1 e3ecd299fa dsfsfd 2021-12-03 21:59:21 +02:00
Aevann1 4df1d57cbb fds 2021-11-30 21:13:57 +02:00
Aevann1 8bddb2163d dfsfsd 2021-11-30 21:12:25 +02:00
Aevann1 7f5cef2cd2 fdsfsd 2021-11-24 00:49:11 +02:00
Aevann1 e248889342 fdsfd 2021-11-24 00:48:23 +02:00
Aevann1 4d0e1eb094 fdsfds 2021-11-24 00:48:16 +02:00
Aevann1 4aed6490ec fdsfdsfd 2021-11-24 00:36:38 +02:00
Aevann1 4b256b649b sdfsdf 2021-11-21 14:32:49 +02:00
Aevann1 2d8d0b9fab er 2021-11-19 23:05:57 +02:00
Aevann1 d285252a38 sfd 2021-11-19 20:58:27 +02:00
Aevann1 2e2b672855 fd 2021-11-19 20:58:10 +02:00
Aevann1 073cbe41c8 gf 2021-11-19 20:55:03 +02:00
Aevann1 d8969feca6 fds 2021-11-19 20:42:59 +02:00
Aevann1 792afa396d vc 2021-11-19 19:47:39 +02:00
Aevann1 7c595fb548 fdsdsf 2021-11-18 23:09:58 +02:00
Aevann1 41fba944fc sdffsd 2021-11-18 23:08:57 +02:00
Aevann1 3e2c1ca32d fdsfsd 2021-11-18 23:06:34 +02:00
Aevann1 e02a4df9cb fdsfds 2021-11-18 22:58:03 +02:00
Aevann1 8a7aa2e25e fdsfd 2021-11-18 22:50:03 +02:00
Aevann1 fceedfe94c fdfd 2021-11-18 22:02:26 +02:00
Aevann1 2f91300ae5 dsffds 2021-11-18 21:30:34 +02:00
Aevann1 262f4c9ae2 fdsfds 2021-11-18 21:19:53 +02:00
Aevann1 e09ea194bf fddf 2021-11-18 21:15:22 +02:00
Aevann1 65d2090cd8 fdsfsd 2021-11-18 16:21:19 +02:00
Aevann1 b139ed44df dfsfds 2021-11-16 17:24:20 +02:00
Aevann1 bdac78658d fsdfsd] 2021-11-16 03:43:44 +02:00
Aevann1 8a49ee0dc3 gffg 2021-11-16 00:13:29 +02:00
Aevann1 4af4ef3319 sdffsd 2021-11-14 00:43:26 +02:00
Aevann1 138e604acf fdfd 2021-11-11 15:10:45 +02:00
Aevann1 9e449dd8b0 redundant 2021-11-06 17:52:48 +02:00
Aevann1 86e939a112 fdssdf 2021-11-02 23:29:53 +02:00
Aevann1 989e622078 Merge branch 'master' of https://github.com/Aevann1/Drama 2021-11-02 13:33:41 -07:00
Aevann1 83dcd2b198 fds 2021-11-02 13:33:36 -07:00
Aevann1 9387b2f425 yolo 2021-11-02 17:17:16 +02:00
Aevann1 e8ce2f06ae dsfdsf 2021-11-01 20:56:56 +02:00
Aevann1 08b1e1cef7 fdsfds 2021-11-01 20:36:46 +02:00
Aevann1 a4925d623f dsfsdf 2021-11-01 20:29:32 +02:00
Aevann1 01236392cf dsfsdf 2021-11-01 20:28:23 +02:00
Aevann1 06e910b456 sfd 2021-11-01 20:27:09 +02:00
Aevann1 20306e5d12 fdsfds 2021-11-01 20:25:10 +02:00
Aevann1 40dc1439f3 our father 2021-10-28 01:51:08 +02:00
Aevann1 912be326d6 sfdsfd 2021-10-28 00:19:53 +02:00
Aevann1 ff0729ec9c gfg 2021-10-27 23:08:58 +02:00
Aevann1 527756e90a fds 2021-10-27 22:12:16 +02:00
Aevann1 1a8eda1ac4 fdsdsf 2021-10-27 03:54:00 +02:00
Aevann1 34eb58c9cb bruh 2021-10-27 02:37:34 +02:00
Aevann1 79164e40bc fds4 2021-10-27 00:52:52 +02:00
Aevann1 74f9877222 6th 2021-10-27 00:30:06 +02:00
Aevann1 02b1a204dc misc 2021-10-24 20:59:50 +02:00
Aevann1 ef42cfdba8 send notif to carp 2021-10-23 18:10:05 +02:00
Aevann1 5ed72c3e47 pause,unpausable 2021-10-23 17:57:25 +02:00
Aevann1 549cc43101 misc 2021-10-23 01:50:00 +02:00
Aevann1 7baf959483 marseybux 2021-10-22 00:55:48 +02:00
Aevann1 784e228d23 fds 2021-10-21 23:34:15 +02:00
Aevann1 6dd0b70e91 dfs 2021-10-21 23:31:48 +02:00
Aevann1 cbbad80e96 disabled 2021-10-21 23:25:21 +02:00
Aevann1 c9a0e91e24 flairlock 2021-10-21 22:50:00 +02:00
Aevann1 1bde12ce55 dfs 2021-10-21 21:25:58 +02:00
Aevann1 21a4298394 sdf 2021-10-21 20:06:57 +02:00
Aevann1 5ddc080587 agendaposter award 2021-10-21 19:01:25 +02:00
Aevann1 9d59de2134 dsf 2021-10-21 17:06:55 +02:00
Aevann1 c9dfbbd73d cum 2021-10-21 16:47:27 +02:00