aND FINALLY THE REST OF THE CODEBASE HOLY FUCK ITS DONE

SQL/database_changelog.txt

@@ -383,4 +383,4 @@ UPDATE erro_library SET deleted = 1 WHERE id = someid
 
 (Replace someid with the id of the book you want to soft delete.)
 
-----------------------------------------------------
+----------------------------------------------------

SQL/errofreedatabase.sql

@@ -12,4 +12,4 @@ ALTER TABLE erro_poll_option RENAME TO SS13_poll_option;
 ALTER TABLE erro_poll_question RENAME TO SS13_poll_question;
 ALTER TABLE erro_poll_textreply RENAME TO SS13_poll_textreply;
 ALTER TABLE erro_poll_vote RENAME TO SS13_poll_vote;
-ALTER TABLE erro_watch RENAME TO SS13_watch;
+ALTER TABLE erro_watch RENAME TO SS13_watch;

SQL/optimisations_2017-02-19.sql

@@ -226,4 +226,4 @@ ALTER TABLE `poll_vote`
 , ADD INDEX `idx_pvote_optionid_ckey` (`optionid` ASC, `ckey` ASC);
 
 ALTER TABLE `poll_textreply`
- ADD INDEX `idx_ptext_pollid_ckey` (`pollid` ASC, `ckey` ASC);
+ ADD INDEX `idx_ptext_pollid_ckey` (`pollid` ASC, `ckey` ASC);

SQL/tgstation_schema.sql

@@ -432,4 +432,4 @@ CREATE TABLE `schema_revision` (
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
 /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;

SQL/tgstation_schema_prefixed.sql

@@ -432,4 +432,4 @@ CREATE TABLE `SS13_schema_revision` (
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
 /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;

interface/stylesheet.dm

@@ -83,7 +83,6 @@ h1.alert, h2.alert		{color: #000000;}
 .green					{color: #03ff39;}
 .shadowling				{color: #3b2769;}
 .cult					{color: #960000;}
-.cultitalic				{color: #960000;	font-style: italic;}
 .cultlarge				{color: #960000; font-weight: bold; font-size: 3;}
 .narsie					{color: #960000; font-weight: bold; font-size: 15;}
 .narsiesmall			{color: #960000; font-weight: bold; font-size: 6;}
@@ -92,7 +91,6 @@ h1.alert, h2.alert		{color: #000000;}
 .hierophant_warning		{color: #660099; font-style: italic;}
 .purple					{color: #5e2d79;}
 .holoparasite			{color: #35333a;}
-.holoparasitebold		{color: #35333a;	font-weight: bold;}
 
 .revennotice			{color: #1d2953;}
 .revenboldnotice		{color: #1d2953;	font-weight: bold;}
@@ -101,10 +99,10 @@ h1.alert, h2.alert		{color: #000000;}
 .revenwarning			{color: #760fbb;	font-style: italic;}
 .revendanger			{color: #760fbb;	font-weight: bold; font-size: 3;}
 .umbra					{color: #5000A0;}
-.umbra_bold				{color: #5000A0;	font-weight: bold;}
-.umbra_italics			{color: #5000A0;	font-style: italic;}
 .umbra_emphasis			{color: #5000A0;	font-weight: bold;	font-style: italic;}
-.umbra_large			{color: #5000A0;	font-size: 3;}
+.umbra_large			{color: #5000A0; font-size: 3; font-weight: bold; font-style: italic;}
+
+.deconversion_message	{color: #5000A0; font-size: 3; font-style: italic;}
 
 .brass					{color: #BE8700;}
 .heavy_brass			{color: #BE8700; font-weight: bold; font-style: italic;}
@@ -113,7 +111,6 @@ h1.alert, h2.alert		{color: #000000;}
 .ratvar					{color: #BE8700; font-size: 6; font-weight: bold; font-style: italic;}
 .alloy					{color: #42474D;}
 .heavy_alloy			{color: #42474D; font-weight: bold; font-style: italic;}
-.large_alloy			{color: #42474D; font-size: 3;}
 .nezbere_large			{color: #42474D; font-size: 3; font-weight: bold; font-style: italic;}
 .nezbere				{color: #42474D; font-weight: bold; font-style: italic;}
 .nezbere_small			{color: #42474D;}
@@ -134,12 +131,12 @@ h1.alert, h2.alert		{color: #000000;}
 .ghostalert				{color: #5c00e6;	font-style: italic; font-weight: bold;}
 
 .alien					{color: #543354;}
-.alienbold				{color: #543354;	font-weight: bold;}
 .noticealien			{color: #00c000;}
 .alertalien				{color: #00c000;	font-weight: bold;}
-.borer					{color: #543354;	font-style: italic;}
 .changeling				{color: #800080;	font-style: italic;}
 
+.spider					{color: #4d004d;}
+
 .interface				{color: #330033;}
 
 .sans					{font-family: "Comic Sans MS", cursive, sans-serif;}
@@ -150,6 +147,7 @@ h1.alert, h2.alert		{color: #000000;}
 .small					{font-size: 1;}
 .big					{font-size: 3;}
 .reallybig				{font-size: 4;}
+.extremelybig			{font-size: 5;}
 .greentext				{color: #00FF00;	font-size: 3;}
 .redtext				{color: #FF0000;	font-size: 3;}
 .clown					{color: #FF69Bf;	font-size: 3; font-family: "Comic Sans MS", cursive, sans-serif; font-weight: bold;}
@@ -166,6 +164,7 @@ h1.alert, h2.alert		{color: #000000;}
 .monkey					{color: #975032;}
 .swarmer				{color: #2C75FF;}
 .resonate				{color: #298F85;}
-.love					{color: #FF69Bf;}
+
-.lovebold				{color: #FF69Bf;	font-weight: bold;}
+.monkeyhive				{color: #774704;}
+.monkeylead				{color: #774704;	font-size: 2;}
 </style>"}

sound/ambience/LICENSE.txt

@@ -2,5 +2,3 @@ ambidet1.ogg is Fast Talking by Kevin Macleod. It has been licensed under the CC
 	It has been cropped for use ingame.
 ambidet2.ogg is Night on the Docks, Piano by Kevin Macleod. It has been licensed under CC-BY 3.0 license.
 	It has been cropped for use ingame, and also fades in.
-title4.ogg is Absconditus by ZhayTee.  It has been licensed under the CC BY-NC-SA 3.0 license.
-	It has been cropped and faded for use ingame.

strings/abductee_objectives.txt

@@ -0,0 +1,40 @@
+Try to get formally executed for a crime you didn't commit, without a false confession.
+Being alone and in large groups are both frightening.  Try to be alone with only one other person whenever possible.
+No matter how they say it, other people keep mispronouncing your name.  Be sure to correct them whenever possible.
+The Syndicate has hired you to compile dossiers on all important members of the crew. Be sure they don't know you're doing it.
+There is only one other person in existence, he is just really good at pretending to be multiple people.
+There are alien parasites masquerading as people's hair.  Save people from this invasion.
+You died back there and went to heaven... or is it hell? No one here seems to know they're dead. Convince them, and maybe you can escape this limbo.
+You are doomed to feel woefully incomplete forever... until you find your true love on this station. They're waiting for you!
+You're the narrator of this tale. Follow around the protagonists to tell their story.
+The leaders of this station are hiding a grand, evil conspiracy. Only you can learn what it is, and expose it to the people!
+All the pets around here suck. You need to make them cooler. Replace them with exotic beasts!
+You're throwing a huge rager. Make it as awesome as possible so the whole crew comes... OR ELSE!
+The clown is not funny. You can do better! Steal his audience and make the crew laugh!
+You burn with passion for music. Share your vision. If anyone hates it, beat them on the head with your instrument!
+Go have a good conversation with the singularity/tesla/supermatter crystal. Bonus points if it responds.
+You are pregnant and soon due. Find a safe place to deliver your baby.
+Expand the station.
+So much lies undiscovered. Look deeper into the machinations of the universe.
+Climb the corporate ladder all the way to the top!
+Fuck the system! Defect from the station and start an independent colony in space, Lavaland or the derelict. Recruit crewmates if you can.
+Nanotrasen is abusing the animals! Save as many as you can!
+It's all an entirely virtual simulation within an underground vault. Convince the crew to escape the shackles of VR.
+This is a secret social experiment conducted by Nanotrasen. Convince the crew that this is the truth.
+Call forth a spirit from the other side.
+You are secretly an android. Interface with as many machines as you can to boost your own power so the AI may acknowledge you at last.
+The elder gods hunger. Gather a cult and conduct a ritual to summon one.
+You have been changed forever. Find the ones that did this to you and give them a taste of their own medicine.
+Ensure your department prospers over all else.
+The crew must get to know one another better. Break down the walls inside the station!
+The CEO of Nanotrasen is coming! Ensure the station is in absolutely pristine condition.
+Flood the station's powernet with as much electricity as you can.
+Replace all the floor tiles with wood, carpeting, grass or bling.
+You must escape the station! Get the shuttle called!
+Don't allow anyone to be cloned.
+The oxygen is killing them all and they don't even know it. Make sure no oxygen is on the station.
+Your body must be improved. Ingest as many drugs as you can.
+You are hungry. Eat as much food as you can find.
+You see you see what they cannot you see the open door you seeE you SEeEe you SEe yOU seEee SHOW THEM ALL
+Convince the crew that you are a paraplegic.
+Start a collection of corpses. Don't kill people to get these corpses.

strings/cas_black.txt

@@ -21,7 +21,7 @@ ________ is the crew's friend. Would you abandon a friend?
 _______ tastes good like a ________ should.
 How did the detective conduct a successful interrogation?
 New in syndicate uplinks: __________!
-NanoTrasen's labor union decided to use _______ to raise employee morale.
+Nanotrasen's labor union decided to use _______ to raise employee morale.
 The Chemist's drug of choice is ______
 According to space law, ________ is now punishable by ______.
 ________ is why I'm afraid of maintenance.

strings/greek_letters.txt

@@ -21,4 +21,4 @@ Upsilon
 Phi
 Chi
 Psi
-Omega
+Omega

strings/hallucination.json

@@ -1,8 +1,8 @@
 {
 	"suspicion": [
-		"I'm watching you...",
+		"@pick(add_name)i'm watching you...",
-		"I know what you're doing",
+		"@pick(add_name)i know what you're doing",
-		"What are you hiding?",
+		"@pick(add_name)what are you hiding?",
 		"I saw that"
 	],
 
@@ -16,12 +16,12 @@
 	],
 
 	"getout": [
-		"Get out",
+		"@pick(add_name)get out",
-		"Get out!",
+		"@pick(add_name)get out!",
-		"Go away",
+		"@pick(add_name)go away",
-		"Fuck off",
+		"@pick(add_name)fuck off",
 		"OUT!",
-		"Out!"
+		"@pick(add_name)out!"
 	],
 
 	"weird": [
@@ -43,10 +43,10 @@
 	"imatraitor": [
 		"Hail Ratvar",
 		"Hail Nar'Sie",
-		"Hey, i've got some TC left, want something?",
+		"Hey, @pick(add_name)i've got some TC left, want something?",
 		"Viva!",
 		"I'll spare you if you don't tell anybody about me",
-		"Hey, are you a traitor too?",
+		"Hey, @pick(add_name)are you a traitor too?",
 		"You're my target, but @pick(excuses)",
 		"Are you mr. @pick(ling_names)?"
 	],
@@ -79,19 +79,24 @@
 		"Omega"
 	],
 
+	"add_name": [
+		"%TARGETNAME%, ",
+		""
+	],
+
 	"doubt": [
 		"Why?",
 		"What?",
 		"Wait, what?",
-		"Wait",
+		"@pick(add_name)wait",
-		"Hold on",
+		"@pick(add_name)hold on",
 		"Uh..."
 	],
 
 	"aggressive": [
-		"Give me that!",
+		"@pick(add_name)give me that!",
-		"I'm going to kill you!",
+		"@pick(add_name)i'm going to kill you!",
-		"Fuck you!"
+		"@pick(add_name)fuck you!"
 	],
 
 	"help": [
@@ -105,19 +110,19 @@
 	],
 
 	"escape": [
-		"RUN!!",
+		"@pick(add_name)RUN!!",
 		"They're behind me!",
 		"It's here!",
-		"Follow me!",
+		"@pick(add_name)follow me!",
-		"Follow me"
+		"@pick(add_name)follow me"
 	],
 
 	"infection_advice": [
-		"stay away",
+		"@pick(add_name)stay away",
-		"don't get close",
+		"@pick(add_name)don't get close",
-		"be careful",
+		"@pick(add_name)be careful",
-		"help me",
+		"@pick(add_name)help me",
-		"kill me"
+		"@pick(add_name)kill me"
 	],
 
 	"people": [
@@ -131,7 +136,7 @@
 		"AI",
 		"Viro",
 		"Qm",
-		"[target.first_name()]"
+		"%TARGETNAME%"
 	],
 
 	"accusations": [
@@ -161,7 +166,8 @@
 		"Traitor",
 		"Harm",
 		"I hear flashing",
-		"Help"
+		"Help",
+		"%TARGETNAME%"
 	],
 
 	"location": [

strings/numbers_as_words.txt

@@ -17,4 +17,4 @@ Sixteen
 Seventeen
 Eighteen
 Nineteen
-Twenty
+Twenty

strings/phonetic_alphabet.txt

@@ -23,4 +23,4 @@ Victor
 Whiskey
 X-ray
 Yankee
-Zulu
+Zulu

strings/round_start_sounds.txt

@@ -1,23 +1,4 @@
 sound/ambience/title1.ogg
 sound/ambience/title2.ogg
 sound/ambience/title3.ogg
-sound/ambience/title4.ogg
-sound/misc/i_did_not_grief_them.ogg
 sound/ambience/clown.ogg
-sound/music/1.ogg
-sound/music/carmenmirandasghost.ogg
-sound/music/century21march.ogg
-sound/music/dawsonschristian.ogg
-sound/music/gaytony.ogg
-sound/music/gi.ogg
-sound/music/moonbaseoddity.ogg
-sound/music/space_asshole.ogg
-sound/music/space_oddity.ogg
-sound/music/starman.ogg
-sound/music/torvus.ogg
-sound/music/shootingstars.ogg
-sound/music/oceanman.ogg
-sound/music/indeep.ogg
-sound/music/goodbyemoonmen.ogg
-sound/music/flytothemoon_otomatone.ogg
-sound/music/milkyway.ogg

strings/station_names.txt

@@ -79,4 +79,4 @@ Meta
 Pub
 Ship
 Book
-Refactor
+Refactor

strings/station_prefixes.txt

@@ -38,4 +38,4 @@ Black
 Grey
 Grim
 Electric
-Burning
+Burning

strings/station_suffixes.txt

@@ -61,4 +61,4 @@ Province
 Workspace
 Metro
 Warehouse
-Space Junk
+Space Junk

strings/tips.txt

@@ -153,21 +153,6 @@ As a Cultist, your team starts off very weak, but if necessary can quickly conve
 As a Cultist, the Blood Boil rune will deal massive amounts of brute damage to non-cultists, stamina damage to Ratvarian scum, and some damage to fellow cultists of Nar-Sie nearby, but will create a fire where the rune stands on use.
 As a Cultist, you can create an army of manifested goons using a combination of the Manifest rune, which creates homunculi from ghosts, and the Blood Drain rune, which drains life from anyone standing on any blood drain rune.
 As a Cultist or Servant, check the alert in the upper-right of your screen for all the details about your cult's current status and objective.
-<<<<<<< HEAD
-As a Servant, your Clockwork Slab fits in pockets and does not need to be held to communicate with other Servants.
-As a Servant, remember that while the selection of scripture and tools Servant cyborgs get is limited, it is still extremely useful, and some of it is unique; for example, engineering and janitor cyborgs get a proselytizer that can use their own power in addition to its own.
-As a Servant, the Judicial Visor is an effective defensive combat tool in small spaces, as it immediately slows and briefly knocks down enemies hit while giving them incentive to avoid staying in the hit area.
-As a Servant, Ocular Wardens, while fragile, do very high, rapid damage to a target non-Servant that can see them and will even attack mechs that contain heretics. Place them behind objects that don't block vision to get the most use out of them.
-As a Servant, Clockwork Structures that require power will draw power from the APC if they cannot find a different source of power, and most power-using Structures will rapidly drain the APC.
-As a Servant, you can repair Servant cyborgs and Clockwork Structures with a Replica Fabricator at a rate of 25W power to 1 health. Damaged Clockwork Structures are less efficient, so don't forget to repair them!
-As a Servant, you can stack different types of Sigils on the same turf; try stacking a Sigil of Transgression and a Sigil of Submission for a subtle conversion trap.
-As a Servant, you can deconstruct a Clockwork Wall with a Replica Fabricator to regain 1000W power. You can also construct Clockwork Walls on Clockwork Floors for a cost of 1000W power.
-As a Servant, Spatial Gateway can teleport to any living Servant or Clockwork Obelisk, and gains additional uses and duration for each Servant assisting in the invocation.
-As a Servant, creating and activating the Gateway to the Celestial Derelict is your ultimate goal, and you must defend it with all the tools you have available.
-As a Servant, you can impale human targets with a Ratvarian Spear by pulling them, then attacking them. This does massive damage and stuns them, and should effectively win the fight.
-As a Servant, Sentinel's Compromise can instantly return you or another Servant to a fighting state by converting half of all their brute, burn, and oxygen damage to toxin, effectively halving the damage they have. Clockwork Floors will also rapidly heal toxin damage in Servants, allowing the Compromise more effectiveness.
-As a Servant, you can unwrench Clockwork Structures to move them around.
-=======
 As a Servant, your jumpsuit functions like a chameleon suit and can take on a lot of different appearances. Use this for stealth and disguise!
 As a Servant, you can unlock scripture tiers early by stockpiling large amounts of power.
 As a Servant, stargazers are a very important tool for power generation, and you should be making them constantly.
@@ -177,7 +162,6 @@ As a Servant, wraith spectacles let you see everything through walls at virtuall
 As a Servant, declaring war empowers a huge amount of your tools and constructs, and makes you into a spaceproof, armored clockwork automaton.
 As a Servant, converting or sabotaging Science and Genetics can make defending the Ark much easier.
 As a Servant, the Clockwork Arnaments scripture allows you to summon armor and/or a weapon at will. Use it whenever you unlock it!
->>>>>>> d2bab31... Merge pull request #32256 from Xhuis/clock_tips
 You can deconvert Cultists of Nar-Sie and Servants of Ratvar by feeding them large amounts of holy water.
 As a Wizard, you can turn people to stone, then animate the resulting statue with a staff of animation to create an extremely powerful minion, for all of 5 minutes at least.
 As a Wizard, the fireball spell performs very poorly at close range, as it can easily catch you in the blast. It is best used as a form of artillery down long hallways.

strings/traumas.json

@@ -31,78 +31,38 @@
         "REVIRT GON CHEM!!!!!!!!",
         "youed call her a toeugh bithc",
         "closd for merbegging",
-        "pray can u @pick(create_verbs) @pick(create_nouns)???",
+        "@pick(semicolon)pray can u @pick(create_verbs) @pick(create_nouns)???",
         "GEY AWAY FROM ME U GREIFING PRICK!!!!",
         "ur a fuckeing autist!",
-        ";HELP SHITECIRTY MURDERIN  MEE!!!",
+        "@pick(semicolon)HELP SHITECIRTY MURDERIN  MEE!!!",
         "hwat dose tha @pick(random_gibberish) mean?????",
-        "CAL; TEH SHUTTLE!!!!!",
+        "@pick(semicolon)CAL; TEH SHUTTLE!!!!!",
         "wearnig siNGUARLTY IS .... FIne xDDDDDDDDD",
-        "AI laW 22 Open door",
+        "@pick(semicolon)AI laW 22 Open door",
-        "this SI mY stATIon......",
+        "@pick(semicolon)this SI mY stATIon......",
         "who the HELL do u thenk u r?!!!!",
         "geT THE FUCK OUTTTT",
         "H U G B O X",
-        "CRASHING THIS STTAYTION WITH NIO SURVIVROS",
+        "@pick(semicolon)CRASHING THIS STTAYTION WITH NIO SURVIVROS",
-        "@pick(servers) is down!!",
+        "@pick(servers) is down!! @pick(bug)",
         "PSHOOOM",
         "REMOVE SINGULARITY",
         "INSTLL TEG",
         "TURBIN IS BEST ENGIENE",
-        "SOLIRS CAN POWER THE HOLE STATION ANEWAY",
+        "SOLIRS CAN POWER THE HOLE STATION ANEWAY @pick(bug)",
         "parasteng was best",
-        "Tajaran has warrrres, if you have coin",
+        "@pick(semicolon)Tajaran has warrrres, if you have coin",
-        "I'VE GOT BALLS OF STEEL",
+        "@pick(semicolon)I'VE GOT BALLS OF STEEL",
         "NO I'M ONNA KILL YOU MOTHERFUCKER OLD STYLE",
         "i will snatch erry motherfucker birthday",
-        "the ai and borgs are mettacomming I think",
+        "@pick(semicolon)the ai and borgs are mettacomming I think",
         "u just did the world a little bit more sad place for someone",
         "WHERES THE SLIP REWRITE WHERE THR FUCK ID IT?",
-		"CEMISTRY SUKS!!!!!!!!",
+        "@pick(semicolon)N-NYAAAAAA~",
-		"youed call her a toeugh bithc",
+        "@pick(bug)",
-		"git gud!!",
+        "@pick(semicolon)wtf??????????? @pick(bug)",
-		"CHEMIT GIB HALNOM PLS",
+        "@pick(semicolon)i ran into the supermattre ten i dsappeard @pick(bug)",
-		"PLASMA iS MENT 2 BE FREE",
+        "DON'T EVER TUCH ME"
-		"LoL tROLED U",
-		"SEC IS A REV, LINCH!!",
-		"FUCK U IM WAY MORE ROBUST u bITCH!!1!!",
-		"iS tHis bay?",
-		"NO PRED CAN eVER CATCH MI",
-		"SCIENCE GIB SHINK RAY PLS",
-		"KILL PUNPUN 4 FUN xDD",
-		"ooc wow rly?",
-		"i play @pick(roles) to only ORDER not DO",
-		"CRAGO ORDER @pick(cargo) PLS",
-		"erp?",
-		"i want to digest u!!!",
-		"i shure hop dere are no PRED arund!!!!",
-		"NOM!1!",
-		"iF it COMPILES it werks!",
-		"LYNCH RObOTIKS NOT GIBING ME MECH WTF?/?",
-		"GWURGLE!!",
-		"balid saled!",
-		"LINCH VIRO",
-		"VIRO GIB SuPR VIrUS!!",
-		"Ai plai vxtest2!",
-		"ahelp kan i b pick@(s_roles)???",
-		";taitor trie to make meh malk/?!1!!",
-		";ENGIE TATOR HE SET UP SINGULO!!!11",
-		"WHEN NAGAS ADdED?/?",
-		"SINDYIE ON SAtIONS GiB gUNS PLISE",
-		"CcLOWN IV SlIPPING MI, SEc t BAR@",
-		"ahelp iT's RP vALiDZ!",
-		"HYDROBONIX PLS WEED PLIESe PLIsE BLAzE IT1!!!",
-		"HALP GOLIATH TENETCAL RAPPPP!!!!111",
-		"DudSE it'S 4:20 LmAO BLAZZ IT xDDDDD",
-		"ahelp DUDE I JUT LOST MY JOBB!!",
-		"looc dude rly",
-		"pray can i heff spells",
-		"aI state dem1!",
-		"SINGULO eNGINE 2 DANGER, SOLARS PLS!",
-		"nerf blob!1",
-		"iM NOT A FUWRRYY!!!",
-		"DON'T EVER TUCH ME",
-		"FOURTEEN INCHES SOFT!!!"
     ],
 
     "mutations": [
@@ -152,11 +112,6 @@
         "sybl",
         "mrs sybil",
         "mr basil",
-		"sisadel",
-		"dullus",
-		"colon marhens",
-		"haylo",
-		"EEGEE",
         "mr terry",
         "berry"
     ],
@@ -172,7 +127,8 @@
         "ayleins",
         "treaitors",
         "sheadow lings",
-        "abdoocters"
+        "abdoocters",
+        "revinent"
     ],
 	
     "bug": [
@@ -237,4 +193,5 @@
 	"BE HEALED, PRIEST.",
 	"YOUR LIFE IS IMPORTANT. KEEP IT."
     ]
+
 }