Synchronize some files with 1.6.0.2

OpenXRay · May 1, 2018 · 6a86c73 · 6a86c73
1 parent 1cc859b
commit 6a86c73
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/res/gamedata/configs/misc/items.ltx b/res/gamedata/configs/misc/items.ltx
@@ -223,8 +223,9 @@ cform                   = skeleton
 class					= II_ATTCH
 visual                  = dynamics\devices\dev_harmonica\dev_harmonica.ogf
 cost					= 35
-inv_name				= "harmonica"
-inv_name_short			= "harmonica"
+inv_name				= st_harmonica_name
+inv_name_short			= st_harmonica_name
+description				= st_harmonica_descr
 inv_weight				= 0.35
 inv_grid_width			= 1
 inv_grid_height			= 1

diff --git a/res/gamedata/scripts/_g.script b/res/gamedata/scripts/_g.script
@@ -39,6 +39,7 @@ dev_debug = false
 sim_debug = false
 mus_vol = 0
 amb_vol = 0
+b_discard_settings_shown = false
 ----------------------------------------------------------------------
 local scripts_to_print =	{
 							["stalker_generic"] = true,