Merge branch 'master' of https://github.com/tgstation/-tg-station into ore_redemp_fixes

Also fixed some weird autodrobe runtime on startup
This commit is contained in:
Ergovisavi
2014-03-02 17:07:24 -08:00
97 changed files with 3874 additions and 5873 deletions
+1
View File
@@ -673,4 +673,5 @@
/obj/item/weapon/tank/jetpack/carbondioxide/mining
name = "mining jetpack"
icon_state = "jetpack-mining"
item_state = "jetpack-mining"
desc = "A tank of compressed carbon dioxide for miners to use as propulsion in local space. Should not be used for internals."