Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32916

2017-12-26 08:24:20 -06:00
parent c2361b6997 14472e5139
commit 290c1e0868
905 changed files with 13267 additions and 8276 deletions
@@ -119,6 +119,8 @@ Hotkey-Mode: (hotkey-mode must be on)
 \t<B></B>h = stop pulling
 \tx = swap-hand
 \tz = activate held object (or y)
+\tShift+e = Put held item into belt or take out most recent item added to belt.
+\tShift+b = Put held item into backpack or take out most recent item added to backpack.
 \tf = cycle-intents-left
 \tg = cycle-intents-right
 \t1 = help-intent
@@ -160,6 +160,7 @@ h1.alert, h2.alert		{color: #000000;}
 .memo					{color: #638500;	text-align: center;}
 .memoedit				{text-align: center;	font-size: 2;}
 .abductor				{color: #800080; font-style: italic;}
+.mind_control			{color: #A00D6F; font-size: 3; font-weight: bold; font-style: italic;}
 .slime					{color: #00CED1;}
 .drone					{color: #848482;}
 .monkey					{color: #975032;}