Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit114

2019-07-05 23:06:57 +02:00
parent 03315d1cbb 01c2d96e34
commit 3ca31617aa
35 changed files with 257 additions and 51 deletions
@@ -322,6 +322,7 @@ h1.alert, h2.alert		{color: #99aab5;}
 .unconscious			{color: #a4bad6;	font-weight: bold;}
 .suicide				{color: #ff5050;	font-style: italic;}
 .red					{color: #FF0000}
+.pink					{color: #ff70c1;}
 .blue					{color: #215cff}
 .green				{color: #059223;}
 .nicegreen				{color: #059223;}