Merge branch 'master' into findnreplace

This commit is contained in:
Mark van Alphen
2017-03-09 17:32:42 +01:00
committed by GitHub
245 changed files with 2163 additions and 1260 deletions
+2
View File
@@ -10,6 +10,8 @@
throw_speed = 3
throw_range = 10
origin_tech = "magnets=1"
toolspeed = 1
usesound = 'sound/items/Deconstruct.ogg'
var/bomb_name = "bomb" // used for naming bombs / mines