24 Commits

Author SHA1 Message Date
Dahlular f45b4bfb4c MultiZ Layenia Base 2022-09-04 10:32:31 -06:00
Dahlular b487573064 Revert "Finally, MultiZ Layenia" 2022-07-09 13:52:49 -06:00
Dahlular e51460cb5d Revert "Merge branch 'master' into fairylights"
This reverts commit 2947727659, reversing
changes made to 91063fe882.
2022-07-09 04:55:33 -06:00
Dahlular 2947727659 Merge branch 'master' into fairylights 2022-07-09 02:53:32 -06:00
Dahlular eaaca202a6 Revert "(CONFIG CHANGE) Updating Economy: Adding Paychecks, and makes Bank Accounts easier to work with" 2022-07-06 16:38:30 -06:00
DragonTrance 7bae2a36ee config junk 2022-06-09 17:54:40 -04:00
DragonTrance 99b3c904d5 fixes + balancing 2022-06-08 19:15:51 -04:00
DragonTrance a256ef54c0 changes the price of everything to scale w/ pay 2022-06-08 18:38:41 -04:00
ProbablyCarl b9db5ff175 ready 2022-05-15 06:54:07 -04:00
Dahlular 2f830a8f2d quick merge fix 2022-05-04 14:49:29 -06:00
Dahlular addf2d79b9 Merge branch 'master' into fairylights 2022-05-04 14:12:41 -06:00
quotefox b75a07ee53 Chicken Farming V1 2022-05-03 17:41:36 +01:00
sarcoph dbf43864d7 fix: cards drawn from hand can merge into original deck
small oversight
2022-04-28 12:49:28 -08:00
sarcoph 68713535ba clearer love dice descriptions 2022-04-25 23:40:03 -08:00
sarcoph 29e53d1cc3 fix failed merge bug
if you merged cards but they were incompatible decks it would delete the cards. this stops it from doing that
2022-04-25 23:19:47 -08:00
sarcoph 104a26dea8 fuck it 2022-04-25 23:00:05 -08:00
sarcoph 157024ee94 base cards done 2022-04-25 22:02:09 -08:00
sarcoph 818fcedad6 cards part 1 2022-04-24 20:28:30 -08:00
Dahlular d04f2377c0 Very Broken Kinaris Carpets/Tables (love u arc) 2022-04-13 09:03:55 -06:00
Dahlular 286b651f62 Timeclock; need TGUI updates 2022-04-11 06:22:01 -06:00
Archie d937b5bc87 The PR no one asked for 2021-10-27 17:24:41 -03:00
Marvin Megavolt 4113fc5bd0 aeiou 2021-05-18 02:37:43 -05:00
QuoteFox 85c7dba12e More portal fleshlight options, and bug fix for nails. 2021-04-18 18:46:48 +01:00
QuoteFox fb21e779b1 Nail paint cosmetics 2021-04-17 22:41:02 +01:00