Fixes merge conflict, does monster860's changes

This commit is contained in:
Kyep
2016-07-28 22:20:15 -07:00
45 changed files with 582 additions and 243 deletions
+2 -1
View File
@@ -249,7 +249,8 @@ CREATE TABLE `SS13_player` (
`volume` smallint(4) DEFAULT '100',
`nanoui_fancy` smallint(4) DEFAULT '1',
`show_ghostitem_attack` smallint(4) DEFAULT '1',
`lastchangelog` varchar(32) NOT NULL,
`lastchangelog` varchar(32) NOT NULL DEFAULT '0',
`exp` mediumtext DEFAULT '',
PRIMARY KEY (`id`),
UNIQUE KEY `ckey` (`ckey`)
) ENGINE=InnoDB AUTO_INCREMENT=32446 DEFAULT CHARSET=latin1;