# HG changeset patch
# User silverwing
# Date 2017-07-27 19:18:06
# Node ID b61e23a135787ed4b6423c61cfd5d63fa37f4ea3
# Parent  3aa7dc4b5d0e236a7e3a84b698f3ae3eb0fdfa02
# Parent  ef26afb8dd27bfa5cd45d5fe0a97390fbe7bcf9a

Merge with default

diff --git a/warehouse32.lua b/warehouse32.lua
--- a/warehouse32.lua
+++ b/warehouse32.lua
@@ -18,6 +18,7 @@ warehouse_32_guard = npc {
 
 warehouse_32_guard_dlg = dlg {
 	nam = "warehouse_32_guard_dlg";
+    disp = "Охранник";
 	entered = function(s)
 		warehouse_32_guard.dlg = nil;
 		warehouse32_visited = true;