From 7417d10c99199e4ad8a2d0a7dba63d56a3d1acb2 Mon Sep 17 00:00:00 2001 From: errorage Date: Wed, 10 Apr 2013 04:40:54 +0200 Subject: [PATCH 1/4] - Removes mimes' ability to speak. Clowns cannot break their clumsy nature, so mimes should not be able to break their silence. --- code/game/jobs/job/civilian.dm | 4 ++-- code/game/jobs/jobprocs.dm | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index e2cf380a9cc..37f92d4556a 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -238,9 +238,9 @@ H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) H.equip_to_slot_or_del(new /obj/item/toy/crayon/mime(H), slot_in_backpack) H.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(H), slot_in_backpack) - H.verbs += /client/proc/mimespeak + //H.verbs += /client/proc/mimespeak H.verbs += /client/proc/mimewall - H.mind.special_verbs += /client/proc/mimespeak + //H.mind.special_verbs += /client/proc/mimespeak H.mind.special_verbs += /client/proc/mimewall H.miming = 1 return 1 diff --git a/code/game/jobs/jobprocs.dm b/code/game/jobs/jobprocs.dm index c2f4331794c..95c8feebfd6 100644 --- a/code/game/jobs/jobprocs.dm +++ b/code/game/jobs/jobprocs.dm @@ -28,6 +28,7 @@ //////////////////////// +/* /client/proc/mimespeak() set category = "Mime" set name = "Speech" @@ -43,4 +44,6 @@ H << "You'll have to wait if you want to atone for your sins." spawn(3000) H.miming = 1 - return \ No newline at end of file + return + + */ \ No newline at end of file From 8a8a5167734f573b97db94d6a38875d8601e75dc Mon Sep 17 00:00:00 2001 From: errorage Date: Sun, 21 Apr 2013 19:35:42 +0200 Subject: [PATCH 2/4] - Updates library table definition - Adds a ckey and datetime column to the library table so we can finally see who is uploading all the exploitive books. --- SQL/tgstation_schema.sql | 18 +++++++++--------- code/modules/library/lib_machines.dm | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/SQL/tgstation_schema.sql b/SQL/tgstation_schema.sql index ea9ace77c6a..e5a2d6ba7ec 100644 --- a/SQL/tgstation_schema.sql +++ b/SQL/tgstation_schema.sql @@ -162,18 +162,18 @@ CREATE TABLE `erro_legacy_population` ( -- -- Table structure for table `erro_library` -- +delimiter $$ -DROP TABLE IF EXISTS `erro_library`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `erro_library` ( - `id` int(11) NOT NULL DEFAULT '0', - `author` text NOT NULL, - `title` text NOT NULL, + `id` int(11) NOT NULL AUTO_INCREMENT, + `author` varchar(45) NOT NULL, + `title` varchar(45) NOT NULL, `content` text NOT NULL, - `category` text NOT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; + `category` varchar(45) NOT NULL, + `ckey` varchar(45) DEFAULT 'LEGACY', + `datetime` datetime DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=5370 DEFAULT CHARSET=latin1$$ -- -- Table structure for table `erro_player` diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index d5c6a696b67..110b79ed8d1 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -351,7 +351,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f var/sqlauthor = sanitizeSQL(scanner.cache.author) var/sqlcontent = sanitizeSQL(scanner.cache.dat) var/sqlcategory = sanitizeSQL(upload_category) - var/DBQuery/query = dbcon.NewQuery("INSERT INTO erro_library (author, title, content, category) VALUES ('[sqlauthor]', '[sqltitle]', '[sqlcontent]', '[sqlcategory]')") + var/DBQuery/query = dbcon.NewQuery("INSERT INTO erro_library (author, title, content, category, ckey, datetime) VALUES ('[sqlauthor]', '[sqltitle]', '[sqlcontent]', '[sqlcategory]', '[usr.ckey]', Now())") if(!query.Execute()) usr << query.ErrorMsg() else From 2769c13edba05daa73207e7aeeab84540d3b2b88 Mon Sep 17 00:00:00 2001 From: errorage Date: Sun, 21 Apr 2013 19:39:33 +0200 Subject: [PATCH 3/4] - Minor fix to the schema file. --- SQL/tgstation_schema.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SQL/tgstation_schema.sql b/SQL/tgstation_schema.sql index e5a2d6ba7ec..54e5a628563 100644 --- a/SQL/tgstation_schema.sql +++ b/SQL/tgstation_schema.sql @@ -162,8 +162,8 @@ CREATE TABLE `erro_legacy_population` ( -- -- Table structure for table `erro_library` -- -delimiter $$ +DROP TABLE IF EXISTS `erro_library`; CREATE TABLE `erro_library` ( `id` int(11) NOT NULL AUTO_INCREMENT, `author` varchar(45) NOT NULL, @@ -173,7 +173,7 @@ CREATE TABLE `erro_library` ( `ckey` varchar(45) DEFAULT 'LEGACY', `datetime` datetime DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=5370 DEFAULT CHARSET=latin1$$ +) ENGINE=InnoDB AUTO_INCREMENT=5370 DEFAULT CHARSET=latin1; -- -- Table structure for table `erro_player` From fbcb241b4b06064fe7e5961ba27cf586c8bc7fb7 Mon Sep 17 00:00:00 2001 From: errorage Date: Sun, 21 Apr 2013 19:49:54 +0200 Subject: [PATCH 4/4] Revert "- Removes mimes' ability to speak. Clowns cannot break their clumsy nature, so mimes should not be able to break their silence." This reverts commit 7417d10c99199e4ad8a2d0a7dba63d56a3d1acb2. --- code/game/jobs/job/civilian.dm | 4 ++-- code/game/jobs/jobprocs.dm | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 37f92d4556a..e2cf380a9cc 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -238,9 +238,9 @@ H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) H.equip_to_slot_or_del(new /obj/item/toy/crayon/mime(H), slot_in_backpack) H.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(H), slot_in_backpack) - //H.verbs += /client/proc/mimespeak + H.verbs += /client/proc/mimespeak H.verbs += /client/proc/mimewall - //H.mind.special_verbs += /client/proc/mimespeak + H.mind.special_verbs += /client/proc/mimespeak H.mind.special_verbs += /client/proc/mimewall H.miming = 1 return 1 diff --git a/code/game/jobs/jobprocs.dm b/code/game/jobs/jobprocs.dm index 95c8feebfd6..c2f4331794c 100644 --- a/code/game/jobs/jobprocs.dm +++ b/code/game/jobs/jobprocs.dm @@ -28,7 +28,6 @@ //////////////////////// -/* /client/proc/mimespeak() set category = "Mime" set name = "Speech" @@ -44,6 +43,4 @@ H << "You'll have to wait if you want to atone for your sins." spawn(3000) H.miming = 1 - return - - */ \ No newline at end of file + return \ No newline at end of file