Commit graph

89 commits

Author SHA1 Message Date
Alexander
de8446e261 Git: WTF u doing m8. 2015-08-26 17:46:01 -04:00
Alexander
4e2c303d3b Add a command to allow you to max someones cog page. 2015-08-26 17:43:41 -04:00
Alexander Behrhof
f7eee2c753 Merge branch 'features/dan' into 'feature/deployment'
Features/dan



See merge request !6
2015-08-19 17:10:00 -04:00
John
2e744ba51f SOS page in detail panel 2015-08-17 15:55:43 +03:00
Master Jumblespeed
6a05d84b04 merge and add 2015-08-14 18:58:37 -04:00
Master Jumblespeed
4904b8040c chat: finalize speedchat from site 2015-08-14 18:50:30 -04:00
John
b8ef66621f CHAT_SETTINGS Account dc field 2015-08-14 00:31:23 +03:00
John
c7011bc757 Don't send trophies on result 2015-08-12 14:55:03 +03:00
John
e2d7b9b674 POPSICLES 2015-08-10 16:33:28 +03:00
John
3093813f06 Holocaust minimum laff for elevators 2015-08-06 12:29:26 +03:00
John
7ad94d8034 Holocaust Talkative Tyler 2015-08-05 13:44:56 +03:00
John
ba586faa6f Improved TV with "remote" 2015-08-03 03:25:37 +03:00
John
d4557e69fa Group Manager 2015-08-01 17:08:37 +03:00
John
90b98ad3ef True Friends 2015-07-31 14:45:00 +03:00
John
49b2422187 Chairs.. my blood went into this.. 2015-07-31 01:15:21 +03:00
John
892addeb9b Add back yes/no/OK 2015-07-28 20:34:26 +03:00
John
6ab319db0f Stats! To-do: fix gone sad 2015-07-28 04:15:28 +03:00
John
e402d25e21 Remove Yes, No, OK (loudrob's favorite) 2015-07-27 22:52:30 +03:00
Master Jumblespeed
fe658a6b03 fix parenthesis 2015-07-27 12:05:02 -04:00
John
75ffd52621 Crates finished :D 2015-07-27 18:02:19 +03:00
John
48ba472271 Initial work on crates and keys + ~factorywarp fix 2015-07-27 13:44:29 +03:00
John
26de40ce8c Ability to switch poles in shticker book + poles appear in every catalog 2015-07-27 10:46:14 +03:00
John
9a059f3893 Add clerks to Cog HQs, change their appearences, clerk rewrite, add ~dna showrandom m/f magic word. 2015-07-25 12:15:08 +03:00
John
9494a47466 New laff restock NPC 2015-07-25 09:08:54 +03:00
tts
cb422fd46b astron: add the centos one 2015-07-24 19:45:15 -04:00
tts
b1df3556b6 adjust permissions so that we may execute the files 2015-07-24 19:42:49 -04:00
JawhnL5
273ad26abb Merge branch 'master' into 'features/ttn'
Add Jumblespeed's prod commits into features/ttn.

See merge request !6
2015-07-24 19:53:58 -04:00
John Cote
987d828d59 dclass: Change uint64 to uint32 for LAST_LOGIN_TS entry. 2015-07-24 20:02:48 -04:00
John Cote
8de82b6f7d Reorganize Jumblespeed's commit 2015-07-24 19:58:37 -04:00
John Cote
1a4e919e0f Revert "stride: add some files for running astron on centos & gameserver on ubuntu (we'll need to switch astron when server chanegs"
This reverts commit dc81ce6331.
2015-07-24 19:33:23 -04:00
tts
dc81ce6331 stride: add some files for running astron on centos & gameserver on ubuntu (we'll need to switch astron when server chanegs 2015-07-24 16:54:50 -04:00
John
7ef12e079a ctime 2015-07-23 23:03:22 +03:00
John
e1de301f2a Revert "Loyalty items cum back. ;(. & add ctime so mongo doesn't complain."
This reverts commit 881a8007df.
2015-07-23 23:00:50 +03:00
Loudrob
881a8007df Loyalty items cum back. ;(. & add ctime so mongo doesn't complain. 2015-07-23 15:54:46 -04:00
John
6ce7485ef4 Loudrob pls 2015-07-23 12:59:17 +03:00
Loudrob
1236e38d62 Current garden progress. 2015-07-20 15:53:53 -04:00
John
18f600b593 RIP Pillows 2015-07-18 03:00:24 +03:00
John
a17151ef96 You can now buy any nametag style, the game will store it. Changeable in the shticker book! 2015-07-18 00:25:20 +03:00
Loudrob
c76b2ca2c8 Easy Promotion Papers 2015-07-17 14:01:50 -04:00
John
50297ca489 Trunks 2015-07-17 17:51:43 +03:00
Loudrob
2de7c4d6ca Merge branch 'features/ttn' of https://github.com/stevetts/tts_src into features/ttn 2015-07-17 10:30:54 -04:00
Loudrob
a20de77143 Disable this for now. 2015-07-17 10:29:56 -04:00
John
fea04b73e7 Give girls girl furniture 2015-07-17 17:24:21 +03:00
John
81e339d9e9 Preparation for next commit (sry have to git reset) 2015-07-17 15:40:14 +03:00
John
61705bbf20 Gifting update!!! 2015-07-17 14:50:16 +03:00
John
de7a36b95e Reverted Loudrob's pro astron update until we have a solution. 2015-07-09 17:39:12 +03:00
Loudrob
d1e778b089 lel new astron 2015-07-09 06:40:13 -04:00
John
32a26abd79 RIP AccountDate + changed CREATED in Account to uint64 instead of string 2015-07-06 22:46:20 +03:00
John
3660d305cd NewsManager setInvasionStatus 2015-06-30 21:50:15 +03:00
John
e4340eb131 Stuff that was bothering me 2015-06-29 21:54:28 +03:00