diff --git a/kod/object/active/holder/room/barlqrm/barapoth.kod b/kod/object/active/holder/room/barlqrm/barapoth.kod index a606ece6..5b28eb8e 100644 --- a/kod/object/active/holder/room/barlqrm/barapoth.kod +++ b/kod/object/active/holder/room/barlqrm/barapoth.kod @@ -34,7 +34,7 @@ classvars: properties: - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF prRoom = room_barapoth piRoom_num = RID_BAR_APOTH diff --git a/kod/object/active/holder/room/barlqrm/barcourt.kod b/kod/object/active/holder/room/barlqrm/barcourt.kod index 7ce82e5a..31a433b8 100644 --- a/kod/object/active/holder/room/barlqrm/barcourt.kod +++ b/kod/object/active/holder/room/barlqrm/barcourt.kod @@ -133,7 +133,7 @@ classvars: viTeleport_row = 6 viTeleport_col = 12 - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF viTerrain_Type = TERRAIN_CITY | TERRAIN_SHOP properties: diff --git a/kod/object/active/holder/room/barlqrm/barjail.kod b/kod/object/active/holder/room/barlqrm/barjail.kod index b6ecf2ef..6434f985 100644 --- a/kod/object/active/holder/room/barlqrm/barjail.kod +++ b/kod/object/active/holder/room/barlqrm/barjail.kod @@ -28,7 +28,7 @@ classvars: viTeleport_row = 6 viTeleport_col = 12 - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF viTerrain_Type = TERRAIN_CITY properties: diff --git a/kod/object/active/holder/room/barlqrm/barmerch.kod b/kod/object/active/holder/room/barlqrm/barmerch.kod index 16013312..44f0f519 100644 --- a/kod/object/active/holder/room/barlqrm/barmerch.kod +++ b/kod/object/active/holder/room/barlqrm/barmerch.kod @@ -35,7 +35,7 @@ classvars: properties: - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF prRoom = room_barmerch piRoom_num = RID_BAR_MERCHANT diff --git a/kod/object/active/holder/room/barlqrm/barsmith.kod b/kod/object/active/holder/room/barlqrm/barsmith.kod index d1bb392f..fc990ca2 100644 --- a/kod/object/active/holder/room/barlqrm/barsmith.kod +++ b/kod/object/active/holder/room/barlqrm/barsmith.kod @@ -35,7 +35,7 @@ classvars: properties: - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF prRoom = room_barloquesmith piRoom_num = RID_BAR_SMITHY diff --git a/kod/object/active/holder/room/barlqrm/barvault.kod b/kod/object/active/holder/room/barlqrm/barvault.kod index 9a4a8880..c46266f9 100644 --- a/kod/object/active/holder/room/barlqrm/barvault.kod +++ b/kod/object/active/holder/room/barlqrm/barvault.kod @@ -46,7 +46,7 @@ classvars: properties: - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF prRoom = room_barvault piRoom_num = RID_BAR_VAULT diff --git a/kod/object/active/holder/room/barlqrm/gmhall.kod b/kod/object/active/holder/room/barlqrm/gmhall.kod index 02cfa3bd..50063bb1 100644 --- a/kod/object/active/holder/room/barlqrm/gmhall.kod +++ b/kod/object/active/holder/room/barlqrm/gmhall.kod @@ -39,7 +39,7 @@ classvars: properties: - viPermanent_flags = ROOM_NO_COMBAT | ROOM_SANCTUARY + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SANCTUARY | ROOM_SAFELOGOFF viTerrain_type = TERRAIN_CITY | TERRAIN_SHOP | TERRAIN_FOUNTAIN prRoom = room_GM_Hall diff --git a/kod/object/active/holder/room/castle2e.kod b/kod/object/active/holder/room/castle2e.kod index 85ad0ea3..15055a82 100644 --- a/kod/object/active/holder/room/castle2e.kod +++ b/kod/object/active/holder/room/castle2e.kod @@ -37,7 +37,7 @@ classvars: properties: - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF prRoom = room_castle2E piRoom_num = RID_CASTLE2E diff --git a/kod/object/active/holder/room/crnthrm/corgenhall.kod b/kod/object/active/holder/room/crnthrm/corgenhall.kod index 502956a1..4e747a31 100644 --- a/kod/object/active/holder/room/crnthrm/corgenhall.kod +++ b/kod/object/active/holder/room/crnthrm/corgenhall.kod @@ -448,7 +448,7 @@ classvars: properties: - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF prRoom = room_corgenhall piRoom_num = RID_COR_GEN_HALL diff --git a/kod/object/active/holder/room/crnthrm/corgroc.kod b/kod/object/active/holder/room/crnthrm/corgroc.kod index f4be792f..6d138bc9 100644 --- a/kod/object/active/holder/room/crnthrm/corgroc.kod +++ b/kod/object/active/holder/room/crnthrm/corgroc.kod @@ -33,7 +33,7 @@ classvars: properties: - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF viTerrain_Type = TERRAIN_CITY | TERRAIN_SHOP prRoom = room_corgroc diff --git a/kod/object/active/holder/room/crnthrm/cormuseum.kod b/kod/object/active/holder/room/crnthrm/cormuseum.kod index fbe25ec5..0ed4f378 100644 --- a/kod/object/active/holder/room/crnthrm/cormuseum.kod +++ b/kod/object/active/holder/room/crnthrm/cormuseum.kod @@ -146,7 +146,7 @@ classvars: properties: - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF viTerrain_Type = TERRAIN_CITY | TERRAIN_SHOP prRoom = room_cormuseum diff --git a/kod/object/active/holder/room/crnthrm/cortail.kod b/kod/object/active/holder/room/crnthrm/cortail.kod index b8cc2955..cc0923c2 100644 --- a/kod/object/active/holder/room/crnthrm/cortail.kod +++ b/kod/object/active/holder/room/crnthrm/cortail.kod @@ -32,7 +32,7 @@ classvars: properties: - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF viTerrain_Type = TERRAIN_CITY | TERRAIN_SHOP prRoom = room_cortail diff --git a/kod/object/active/holder/room/crnthrm/coruniv.kod b/kod/object/active/holder/room/crnthrm/coruniv.kod index aefbf4fb..ddc8f8ce 100644 --- a/kod/object/active/holder/room/crnthrm/coruniv.kod +++ b/kod/object/active/holder/room/crnthrm/coruniv.kod @@ -32,7 +32,7 @@ classvars: properties: - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF viTerrain_Type = TERRAIN_CITY | TERRAIN_SHOP prRoom = room_coruniv diff --git a/kod/object/active/holder/room/crnthrm/corwepm.kod b/kod/object/active/holder/room/crnthrm/corwepm.kod index beec1ecf..bd35338f 100644 --- a/kod/object/active/holder/room/crnthrm/corwepm.kod +++ b/kod/object/active/holder/room/crnthrm/corwepm.kod @@ -36,7 +36,7 @@ classvars: properties: - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF prRoom = room_weaponsmaster piRoom_num = RID_COR_WEAPONSMASTER diff --git a/kod/object/active/holder/room/jasperrm/jasbank.kod b/kod/object/active/holder/room/jasperrm/jasbank.kod index 13d57aaa..4416a2c8 100644 --- a/kod/object/active/holder/room/jasperrm/jasbank.kod +++ b/kod/object/active/holder/room/jasperrm/jasbank.kod @@ -39,7 +39,7 @@ classvars: properties: - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF prRoom = room_jasbank piRoom_num = RID_JAS_BANK diff --git a/kod/object/active/holder/room/jasperrm/jaselder.kod b/kod/object/active/holder/room/jasperrm/jaselder.kod index b645bd01..17bc4bf4 100644 --- a/kod/object/active/holder/room/jasperrm/jaselder.kod +++ b/kod/object/active/holder/room/jasperrm/jaselder.kod @@ -30,7 +30,7 @@ classvars: viTeleport_row = 9 viTeleport_col = 7 - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF viTerrain_type = TERRAIN_CITY | TERRAIN_RESIDENCE properties: diff --git a/kod/object/active/holder/room/jasperrm/jassmith.kod b/kod/object/active/holder/room/jasperrm/jassmith.kod index db68eddb..d1d6e0b4 100644 --- a/kod/object/active/holder/room/jasperrm/jassmith.kod +++ b/kod/object/active/holder/room/jasperrm/jassmith.kod @@ -30,7 +30,7 @@ classvars: viTeleport_row = 9 viTeleport_col = 9 - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF viTerrain_type = TERRAIN_CITY | TERRAIN_SHOP properties: diff --git a/kod/object/active/holder/room/jasperrm/jasstore.kod b/kod/object/active/holder/room/jasperrm/jasstore.kod index ae36b00f..b32c7120 100644 --- a/kod/object/active/holder/room/jasperrm/jasstore.kod +++ b/kod/object/active/holder/room/jasperrm/jasstore.kod @@ -30,7 +30,7 @@ classvars: viTeleport_row = 19 viTeleport_col = 5 - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF viTerrain_type = TERRAIN_CITY | TERRAIN_SHOP properties: diff --git a/kod/object/active/holder/room/jasperrm/jasvault.kod b/kod/object/active/holder/room/jasperrm/jasvault.kod index d641de71..17543ea7 100644 --- a/kod/object/active/holder/room/jasperrm/jasvault.kod +++ b/kod/object/active/holder/room/jasperrm/jasvault.kod @@ -45,7 +45,7 @@ classvars: properties: - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF prRoom = room_jaspervault piRoom_num = RID_JAS_VAULT diff --git a/kod/object/active/holder/room/kocarm/kocapoth.kod b/kod/object/active/holder/room/kocarm/kocapoth.kod index 8f3f9d65..e3a0e978 100644 --- a/kod/object/active/holder/room/kocarm/kocapoth.kod +++ b/kod/object/active/holder/room/kocarm/kocapoth.kod @@ -30,7 +30,7 @@ classvars: viTeleport_col = 5 viTerrain_Type = TERRAIN_CITY | TERRAIN_SHOP - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF properties: diff --git a/kod/object/active/holder/room/kocarm/kocbank.kod b/kod/object/active/holder/room/kocarm/kocbank.kod index b19cd832..01b4e221 100644 --- a/kod/object/active/holder/room/kocarm/kocbank.kod +++ b/kod/object/active/holder/room/kocarm/kocbank.kod @@ -45,7 +45,7 @@ classvars: viTeleport_col = 8 viTerrain_Type = TERRAIN_CITY | TERRAIN_SHOP - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF properties: diff --git a/kod/object/active/holder/room/kocarm/kocblack.kod b/kod/object/active/holder/room/kocarm/kocblack.kod index 95250c5e..8ebeda95 100644 --- a/kod/object/active/holder/room/kocarm/kocblack.kod +++ b/kod/object/active/holder/room/kocarm/kocblack.kod @@ -35,7 +35,7 @@ classvars: viTeleport_col = 6 viTerrain_Type = TERRAIN_CITY | TERRAIN_SHOP - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF properties: diff --git a/kod/object/active/holder/room/kocarm/kochoha.kod b/kod/object/active/holder/room/kocarm/kochoha.kod index 3d91fb97..5ca425fa 100644 --- a/kod/object/active/holder/room/kocarm/kochoha.kod +++ b/kod/object/active/holder/room/kocarm/kochoha.kod @@ -35,7 +35,7 @@ classvars: properties: - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF prRoom = room_KocatanHallA piRoom_num = RID_KOC_HALL_OF_HEROES_A diff --git a/kod/object/active/holder/room/kocarm/kochohb.kod b/kod/object/active/holder/room/kocarm/kochohb.kod index 3a2e0648..434f0f50 100644 --- a/kod/object/active/holder/room/kocarm/kochohb.kod +++ b/kod/object/active/holder/room/kocarm/kochohb.kod @@ -88,7 +88,7 @@ classvars: properties: - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF prRoom = room_KocatanHallB piRoom_num = RID_KOC_HALL_OF_HEROES_B diff --git a/kod/object/active/holder/room/kocarm/kocstore.kod b/kod/object/active/holder/room/kocarm/kocstore.kod index d73b3363..33bb8ae3 100644 --- a/kod/object/active/holder/room/kocarm/kocstore.kod +++ b/kod/object/active/holder/room/kocarm/kocstore.kod @@ -30,7 +30,7 @@ classvars: viTeleport_col = 12 viTerrain_Type = TERRAIN_CITY | TERRAIN_SHOP - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF properties: diff --git a/kod/object/active/holder/room/kocarm/koctail.kod b/kod/object/active/holder/room/kocarm/koctail.kod index 1c7c4c0c..7234ce6b 100644 --- a/kod/object/active/holder/room/kocarm/koctail.kod +++ b/kod/object/active/holder/room/kocarm/koctail.kod @@ -37,7 +37,7 @@ classvars: viTeleport_col = 5 viTerrain_Type = TERRAIN_CITY | TERRAIN_SHOP - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF properties: diff --git a/kod/object/active/holder/room/kocarm/koctower.kod b/kod/object/active/holder/room/kocarm/koctower.kod index 2adca16e..7472ce85 100644 --- a/kod/object/active/holder/room/kocarm/koctower.kod +++ b/kod/object/active/holder/room/kocarm/koctower.kod @@ -44,7 +44,7 @@ classvars: viTeleport_col = 32 viTerrain_Type = TERRAIN_CITY | TERRAIN_CASTLE - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF properties: diff --git a/kod/object/active/holder/room/marnrm/marhlshp.kod b/kod/object/active/holder/room/marnrm/marhlshp.kod index 8f7bb2b5..d9dc62bb 100644 --- a/kod/object/active/holder/room/marnrm/marhlshp.kod +++ b/kod/object/active/holder/room/marnrm/marhlshp.kod @@ -35,7 +35,7 @@ classvars: properties: - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF prRoom = room_MarionHealerShop piRoom_num = RID_MAR_HEALER_SHOP diff --git a/kod/object/active/holder/room/marnrm/marion.kod b/kod/object/active/holder/room/marnrm/marion.kod index 2b2d5e73..59ca93fc 100644 --- a/kod/object/active/holder/room/marnrm/marion.kod +++ b/kod/object/active/holder/room/marnrm/marion.kod @@ -69,7 +69,7 @@ resources: classvars: vrName = room_name_marion - viPermanent_flags = ROOM_NO_COMBAT | ROOM_LAMPS + viPermanent_flags = ROOM_NO_COMBAT | ROOM_LAMPS | ROOM_SAFELOGOFF viTeleport_row = 56 viTeleport_col = 39 diff --git a/kod/object/active/holder/room/monsroom/kcforest/kmadscih.kod b/kod/object/active/holder/room/monsroom/kcforest/kmadscih.kod index 374274df..3feb9e2a 100644 --- a/kod/object/active/holder/room/monsroom/kcforest/kmadscih.kod +++ b/kod/object/active/holder/room/monsroom/kcforest/kmadscih.kod @@ -31,7 +31,7 @@ classvars: viTeleport_col = 4 viTerrain_type = TERRAIN_RESIDENCE - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF properties: diff --git a/kod/object/active/holder/room/monsroom/objroom/duke4.kod b/kod/object/active/holder/room/monsroom/objroom/duke4.kod index 9d44c38c..4105c0e2 100644 --- a/kod/object/active/holder/room/monsroom/objroom/duke4.kod +++ b/kod/object/active/holder/room/monsroom/objroom/duke4.kod @@ -33,7 +33,7 @@ classvars: properties: - viPermanent_flags = ROOM_NO_COMBAT | ROOM_SANCTUARY + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SANCTUARY | ROOM_SAFELOGOFF prRoom = room_duke4 piRoom_num = RID_DUKE4 diff --git a/kod/object/active/holder/room/monsroom/objroom/duke5.kod b/kod/object/active/holder/room/monsroom/objroom/duke5.kod index f256c644..eec2d291 100644 --- a/kod/object/active/holder/room/monsroom/objroom/duke5.kod +++ b/kod/object/active/holder/room/monsroom/objroom/duke5.kod @@ -120,7 +120,7 @@ classvars: properties: - viPermanent_flags = ROOM_NO_COMBAT | ROOM_SANCTUARY + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SANCTUARY | ROOM_SAFELOGOFF prRoom = room_duke5 piRoom_num = RID_DUKE5 diff --git a/kod/object/active/holder/room/monsroom/objroom/marsmith.kod b/kod/object/active/holder/room/monsroom/objroom/marsmith.kod index 47098b1d..98a1e8fb 100644 --- a/kod/object/active/holder/room/monsroom/objroom/marsmith.kod +++ b/kod/object/active/holder/room/monsroom/objroom/marsmith.kod @@ -30,7 +30,7 @@ classvars: viTeleport_row = 10 viTeleport_col = 4 - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF viTerrain_type = TERRAIN_CITY | TERRAIN_SHOP diff --git a/kod/object/active/holder/room/monsroom/oldtown/oldcoruniv.kod b/kod/object/active/holder/room/monsroom/oldtown/oldcoruniv.kod index 6f1e31ea..71434aa3 100644 --- a/kod/object/active/holder/room/monsroom/oldtown/oldcoruniv.kod +++ b/kod/object/active/holder/room/monsroom/oldtown/oldcoruniv.kod @@ -33,7 +33,7 @@ classvars: properties: - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF prRoom = room_oldcoruniv piRoom_num = RID_OLD_COR_UNIV diff --git a/kod/object/active/holder/room/monsroom/oldtown/oldtosapoth.kod b/kod/object/active/holder/room/monsroom/oldtown/oldtosapoth.kod index 1e109165..8cf98144 100644 --- a/kod/object/active/holder/room/monsroom/oldtown/oldtosapoth.kod +++ b/kod/object/active/holder/room/monsroom/oldtown/oldtosapoth.kod @@ -33,7 +33,7 @@ classvars: properties: - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF prRoom = room_oldtosapoth piRoom_num = RID_OLD_TOS_APOTH diff --git a/kod/object/active/holder/room/monsroom/oldtown/oldtosinn.kod b/kod/object/active/holder/room/monsroom/oldtown/oldtosinn.kod index d5870e1a..3024b8bd 100644 --- a/kod/object/active/holder/room/monsroom/oldtown/oldtosinn.kod +++ b/kod/object/active/holder/room/monsroom/oldtown/oldtosinn.kod @@ -33,7 +33,7 @@ classvars: properties: - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF prRoom = room_oldtosinn piRoom_num = RID_OLD_TOS_INN diff --git a/kod/object/active/holder/room/monsroom/oldtown/oldtossmith.kod b/kod/object/active/holder/room/monsroom/oldtown/oldtossmith.kod index b750df0d..b07e1f7f 100644 --- a/kod/object/active/holder/room/monsroom/oldtown/oldtossmith.kod +++ b/kod/object/active/holder/room/monsroom/oldtown/oldtossmith.kod @@ -33,7 +33,7 @@ classvars: properties: - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF prRoom = room_oldtossmith piRoom_num = RID_OLD_TOS_SMITH diff --git a/kod/object/active/holder/room/razarm/raza.kod b/kod/object/active/holder/room/razarm/raza.kod index ed4d5ec5..a8760a4d 100644 --- a/kod/object/active/holder/room/razarm/raza.kod +++ b/kod/object/active/holder/room/razarm/raza.kod @@ -80,7 +80,7 @@ classvars: viTeleport_col = 41 viTeleport_angle = ANGLE_NORTH - viPermanent_flags = ROOM_NO_COMBAT | ROOM_LAMPS + viPermanent_flags = ROOM_NO_COMBAT | ROOM_LAMPS | ROOM_SAFELOGOFF viTerrain_type = TERRAIN_CITY | TERRAIN_ROAD | TERRAIN_LAKE | TERRAIN_FOREST viFlag_row = 20 diff --git a/kod/object/active/holder/room/razarm/razahut.kod b/kod/object/active/holder/room/razarm/razahut.kod index 8be6a4b3..98668f90 100644 --- a/kod/object/active/holder/room/razarm/razahut.kod +++ b/kod/object/active/holder/room/razarm/razahut.kod @@ -46,7 +46,7 @@ classvars: viTeleport_row = 2 viTeleport_col = 2 - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF viTerrain_type = TERRAIN_CITY | TERRAIN_RESIDENCE properties: diff --git a/kod/object/active/holder/room/razarm/razamuseum.kod b/kod/object/active/holder/room/razarm/razamuseum.kod index c8cf0532..962f3919 100644 --- a/kod/object/active/holder/room/razarm/razamuseum.kod +++ b/kod/object/active/holder/room/razarm/razamuseum.kod @@ -98,7 +98,7 @@ classvars: viTeleport_row = 8 viTeleport_col = 11 - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF viTerrain_types = TERRAIN_CITY | TERRAIN_SHOP properties: diff --git a/kod/object/active/holder/room/razarm/razashop.kod b/kod/object/active/holder/room/razarm/razashop.kod index 182dd51a..3f10f0e3 100644 --- a/kod/object/active/holder/room/razarm/razashop.kod +++ b/kod/object/active/holder/room/razarm/razashop.kod @@ -50,7 +50,7 @@ classvars: viTeleport_row = 5 viTeleport_col = 4 - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF viTerrain_type = TERRAIN_CITY | TERRAIN_SHOP properties: diff --git a/kod/object/active/holder/room/razarm/razasmith.kod b/kod/object/active/holder/room/razarm/razasmith.kod index e5509a72..f24af91b 100644 --- a/kod/object/active/holder/room/razarm/razasmith.kod +++ b/kod/object/active/holder/room/razarm/razasmith.kod @@ -59,7 +59,7 @@ classvars: properties: - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF prRoom = room_razasmith piRoom_num = RID_RAZA_SMITH diff --git a/kod/object/active/holder/room/tosrm/tosapoth.kod b/kod/object/active/holder/room/tosrm/tosapoth.kod index b5ca7d06..0468ace0 100644 --- a/kod/object/active/holder/room/tosrm/tosapoth.kod +++ b/kod/object/active/holder/room/tosrm/tosapoth.kod @@ -157,7 +157,7 @@ classvars: properties: - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF prRoom = room_tosapoth piRoom_num = RID_TOS_APOTH diff --git a/kod/object/active/holder/room/tosrm/tosbank.kod b/kod/object/active/holder/room/tosrm/tosbank.kod index 67680af3..1ba8e44d 100644 --- a/kod/object/active/holder/room/tosrm/tosbank.kod +++ b/kod/object/active/holder/room/tosrm/tosbank.kod @@ -37,7 +37,7 @@ classvars: properties: - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF viTerrain_type = TERRAIN_CITY | TERRAIN_SHOP prRoom = room_tosbank diff --git a/kod/object/active/holder/room/tosrm/toscellar.kod b/kod/object/active/holder/room/tosrm/toscellar.kod index 554e6aae..8300d27c 100644 --- a/kod/object/active/holder/room/tosrm/toscellar.kod +++ b/kod/object/active/holder/room/tosrm/toscellar.kod @@ -29,7 +29,7 @@ classvars: viTerrain_type = TERRAIN_CITY properties: - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF prRoom = room_TosInnCellar piRoom_num = RID_TOS_INN_CELLAR diff --git a/kod/object/active/holder/room/tosrm/tossmith.kod b/kod/object/active/holder/room/tosrm/tossmith.kod index d9752f42..ee8029ce 100644 --- a/kod/object/active/holder/room/tosrm/tossmith.kod +++ b/kod/object/active/holder/room/tosrm/tossmith.kod @@ -35,7 +35,7 @@ classvars: properties: - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF prRoom = room_tossmith piRoom_num = RID_TOS_SMITHY diff --git a/kod/object/active/holder/room/tosrm/tosstorage.kod b/kod/object/active/holder/room/tosrm/tosstorage.kod index 7522d471..4d9cd6eb 100644 --- a/kod/object/active/holder/room/tosrm/tosstorage.kod +++ b/kod/object/active/holder/room/tosrm/tosstorage.kod @@ -33,7 +33,7 @@ classvars: properties: - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF prRoom = room_tosstorage piRoom_num = RID_TOS_STORAGE diff --git a/kod/object/active/holder/room/tosrm/tostavern.kod b/kod/object/active/holder/room/tosrm/tostavern.kod index f84e5bb4..605042ef 100644 --- a/kod/object/active/holder/room/tosrm/tostavern.kod +++ b/kod/object/active/holder/room/tosrm/tostavern.kod @@ -29,7 +29,7 @@ classvars: viTerrain_type = TERRAIN_CITY | TERRAIN_RESIDENCE properties: - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF prRoom = room_TosTavern piRoom_num = RID_TOS_OLD_TAVERN diff --git a/kod/object/active/holder/room/tpost2.kod b/kod/object/active/holder/room/tpost2.kod index 06410cf0..b8d01c60 100644 --- a/kod/object/active/holder/room/tpost2.kod +++ b/kod/object/active/holder/room/tpost2.kod @@ -35,7 +35,7 @@ classvars: viTeleport_col = 3 viTerrain_Type = TERRAIN_CITY | TERRAIN_SHOP - viPermanent_flags = ROOM_NO_COMBAT + viPermanent_flags = ROOM_NO_COMBAT | ROOM_SAFELOGOFF properties: