Worked On Traps

Working on Traps timer, Drafting door opening.
Merge remote-tracking branch 'origin/master'

Conflicts:
	RPGCombat/Assembly-UnityScript-Editor-vs.unityproj
	RPGCombat/Assembly-UnityScript-Editor.unityproj
	RPGCombat/Library/AssetServerCacheV3
	RPGCombat/Library/CurrentLayout.dwlt
	RPGCombat/Library/InspectorExpandedItems.asset
	RPGCombat/Library/ScriptAssemblies/Assembly-CSharp.dll
	RPGCombat/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	RPGCombat/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll
	RPGCombat/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb
	RPGCombat/Library/assetDatabase3
	RPGCombat/Library/expandedItems
	RPGCombat/Library/guidmapper
	RPGCombat/Library/metadata/01/012a58f325707b04eb15aa720234e069
	RPGCombat/Library/metadata/06/069e7794e193e40edba7dcac6cf49d62
	RPGCombat/Library/metadata/09/090f6865035854d0dac1de847b467e77
	RPGCombat/Library/metadata/0a/0a7dde8a8dadb7942a63e56ade4c6a76
	RPGCombat/Library/metadata/0c/0cea98859a0b18a42810244827ccc510
	RPGCombat/Library/metadata/0f/0f988753606424c6ea6bfd4ff58bd87d
	RPGCombat/Library/metadata/14/147498700742b44a3a277e1183fafb65
	RPGCombat/Library/metadata/14/14f2303e5557d483fabe7392cd3f74ac
	RPGCombat/Library/metadata/16/16069e3e1c1f3489ca2ef81afb533c4d
	RPGCombat/Library/metadata/1d/1d4f32eb36ff748d3927975c04f935d4
	RPGCombat/Library/metadata/1e/1eef07eec81d70943b01b2fff9112f41
	RPGCombat/Library/metadata/20/20d20ba084fb54fafa83046b68d5128f
	RPGCombat/Library/metadata/22/223a564eafec7431fbac040b13725f98
	RPGCombat/Library/metadata/22/22a8aacd037eb4c1b97fcb9cfe01b0a7
	RPGCombat/Library/metadata/23/23edd2872b782cb4db30fe5a4556d775
	RPGCombat/Library/metadata/24/24401eec78b9841b08d45ec4f6315793
	RPGCombat/Library/metadata/2a/2a5a3aca3fbc2a547921c5e1439ecacc
	RPGCombat/Library/metadata/36/369028089db974eef91c5f5e70fc3ae9
	RPGCombat/Library/metadata/37/3730fe981565042cc90e01f1869f9488
	RPGCombat/Library/metadata/3c/3caab7c8802444bf88edc9b6e006f336
	RPGCombat/Library/metadata/40/4059dbbf543db44938f9b0bb7fcda5fd
	RPGCombat/Library/metadata/40/40c6247ea739c4cc2954551f675dcb52
	RPGCombat/Library/metadata/45/45a32b5fd2125a648a011e6a30fc2a37
	RPGCombat/Library/metadata/46/467e6a7261f28431bb301cc6bda77699
	RPGCombat/Library/metadata/47/4797c2ee909eb3a4ab5815daa700efbb
	RPGCombat/Library/metadata/47/47b28254703894110ba197c9603b4a35
	RPGCombat/Library/metadata/4c/4c56efbdf5e8948f083ae3c00381543e
	RPGCombat/Library/metadata/52/5203bd0b4dbed46b08fe9860b8ae0708
	RPGCombat/Library/metadata/52/529e15e9a290a49f79400154cdd9408b
	RPGCombat/Library/metadata/54/54e90bc4f0a0646b3bd65312ac5bcf8e
	RPGCombat/Library/metadata/55/5537fed6ed87546f3875e9b142175ac2
	RPGCombat/Library/metadata/55/558b06e904c0c4fc1b3411df3aeed716
	RPGCombat/Library/metadata/56/562500b4d6ae14707b5f1d6d9d14322e
	RPGCombat/Library/metadata/56/562a1e250e7ec4600997ee495adb6370
	RPGCombat/Library/metadata/57/5781b4b61c1dc4f3f8e62fe6ad058648
	RPGCombat/Library/metadata/57/57952651855034582b873bd8e73fe38a
	RPGCombat/Library/metadata/57/57ba09a8852954739a442b470f855968
	RPGCombat/Library/metadata/5e/5ef013404150e4e64a3d40bb8c992007
	RPGCombat/Library/metadata/60/60c087e6d68584fb0a4a90375b234c0d
	RPGCombat/Library/metadata/61/61f0e56aa39f842d095c87bd2817f643
	RPGCombat/Library/metadata/62/62c13e331d661464ea8eddcc2df89d6a
	RPGCombat/Library/metadata/63/636dcf772f0184dec87efc9677e50d56
	RPGCombat/Library/metadata/65/65e110b95972e4fcda2a0b1592cba5f8
	RPGCombat/Library/metadata/6a/6a17c84dcf6a344a9a1fdc943e66b751
	RPGCombat/Library/metadata/6b/6b721990e7bf24c6292a3b7ed9a8f2ff
	RPGCombat/Library/metadata/6c/6ccb14f40976a48318f675f2d0c3a697
	RPGCombat/Library/metadata/6e/6e5ee2a0c13214a878e5a3a296d22a8c
	RPGCombat/Library/metadata/6f/6fc62d06baeab4c78bd3d43844e7f9a5
	RPGCombat/Library/metadata/72/72c8f6839e1484def8f45bbe380657d4
	RPGCombat/Library/metadata/76/761c6fe794f444a5dba3bf3f797ae8dd
	RPGCombat/Library/metadata/76/76b4d27a8a2e22844a6a656f43797511
	RPGCombat/Library/metadata/78/78c2e2c2e57b744da96a802f969f5719
	RPGCombat/Library/metadata/79/797772247b54ea74fb0982a2bde81d28
	RPGCombat/Library/metadata/7a/7a116ebff4c174927a22245cbc768f83
	RPGCombat/Library/metadata/7a/7a4058774cef7451d909b026541e6ba6
	RPGCombat/Library/metadata/83/83528e6d97a8c45e3a93971f07a93d48
	RPGCombat/Library/metadata/87/87621099a35de46f680f68b315655068
	RPGCombat/Library/metadata/8a/8a270adf9c3fbdd4f8e30a0d695d5d68
	RPGCombat/Library/metadata/8b/8b1300ad1c82d4b78a3fd83a91707973
	RPGCombat/Library/metadata/8e/8ecf6df1bd6074347982b2df38eac773
	RPGCombat/Library/metadata/8f/8f97d000b9aee4a6dbbfd22fc5ae8897
	RPGCombat/Library/metadata/92/92206aef483fa4420adf84a63dfb913e
	RPGCombat/Library/metadata/92/92ed403c79545419fb454dda6e9a7df9
	RPGCombat/Library/metadata/94/9467476fb44a247c38bcc9952e3bf21a
	RPGCombat/Library/metadata/98/98257e06b08bf4b558ea85de4032f082
	RPGCombat/Library/metadata/9a/9abcebf8f23c24059858d3aa24630dda
	RPGCombat/Library/metadata/9b/9b51978edbfb54986b9f9dc394614d9c
	RPGCombat/Library/metadata/9d/9d48673da1d81ab48a8a568b0fecb17d
	RPGCombat/Library/metadata/a6/a601f72b783c16549828b37f286bdf67
	RPGCombat/Library/metadata/a9/a93d2214fab822a4eaed894ebdf8e270
	RPGCombat/Library/metadata/a9/a99a32caa0e3280418a920c981b91b40
	RPGCombat/Library/metadata/b0/b033bf3a8dacb412285ff1341245296e
	RPGCombat/Library/metadata/b4/b42b05d21d898ee41b7be1ac643d0b15
	RPGCombat/Library/metadata/b6/b6e762c361de0460e8fe5bf35d354bd8
	RPGCombat/Library/metadata/b9/b913ee841b09847b7b9d06652de27219
	RPGCombat/Library/metadata/ba/bab8da417eb9b468a874da2d04d87bd6
	RPGCombat/Library/metadata/bf/bfcdc3652de4e47c5b9bca232e9f2fcc
	RPGCombat/Library/metadata/c2/c273827db1ce943e08526acfa0c8a706
	RPGCombat/Library/metadata/c6/c6593ac9a6dc14353878d0cd3cedf5e2
	RPGCombat/Library/metadata/c7/c7e73cf2694d7414aaed50577f28d90e
	RPGCombat/Library/metadata/cc/cc24dfd7687e847f4b71d3937a6fcb31
	RPGCombat/Library/metadata/cc/ccb4443bdf9e5420ba70e5df8e13dd9c
	RPGCombat/Library/metadata/ce/ce91078aab5b0974b9e93dd3edde5fae
	RPGCombat/Library/metadata/cf/cf49cf986ee9e401aabc536fa3ede5c0
	RPGCombat/Library/metadata/cf/cfa3575701da8407dba30fd6efb38967
	RPGCombat/Library/metadata/d1/d16086cf33d224433853fc9e1c6d1c19
	RPGCombat/Library/metadata/d2/d228e6d53d55f9243bbc45e91f48440a
	RPGCombat/Library/metadata/d3/d354f58f2994a472c8fbe9d10463394a
	RPGCombat/Library/metadata/d3/d3ab1bf1063b8457ca81f10f9193746d
	RPGCombat/Library/metadata/d5/d56ffd4b8685440168cd1ab8b645d321
	RPGCombat/Library/metadata/d9/d9accca605fa5d949bc69e171adb1a22
	RPGCombat/Library/metadata/db/dbbb97cd62eb74d72a99534c46474bf1
	RPGCombat/Library/metadata/de/de76428db3c5d714ab3f80abecfe33d5
	RPGCombat/Library/metadata/df/df666e8ff5b0e4c899630e632de58c6c
	RPGCombat/Library/metadata/e0/e008383cb2f2b4f6a8e31551edb1ecd1
	RPGCombat/Library/metadata/e7/e7090a4856e6c49189e0146c7797e95a
	RPGCombat/Library/metadata/e7/e7bec6c093f7540878794c5e85135631
	RPGCombat/Library/metadata/ee/ee7a08c04fbefea47a8cb319e804907b
	RPGCombat/Library/metadata/f0/f028646173263481c860988a050ebe55
	RPGCombat/Library/metadata/f3/f324f3061e5874e148cb12ec7db1fec0
	RPGCombat/Library/metadata/f3/f3a1d26071034422f84b7c2dabda730d
	RPGCombat/Library/metadata/f5/f541b99ca6266479297f2842daa59703
	RPGCombat/Library/metadata/f5/f5528faa32b42df4c92e00416313f890
	RPGCombat/Library/metadata/f6/f6f30e4c1373840ec9d50ea2bf8bf09d
	RPGCombat/Library/metadata/f9/f925eb01e349b46c6a75875962eb309b
	RPGCombat/Library/metadata/fb/fb333068be3b144ce9e8730370739646
	RPGCombat/RPGCombat.userprefs