Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Hawk_v3
2018-10-14 17:09:41 +01:00
105 changed files with 3030 additions and 584 deletions

View File

@@ -30,11 +30,6 @@
var/excavation_amount = 200
/obj/item/weapon/pickaxe/hammer
name = "sledgehammer"
//icon_state = "sledgehammer" Waiting on sprite
desc = "A mining hammer made of reinforced metal. You feel like smashing your boss in the face with this."
/obj/item/weapon/pickaxe/silver
name = "silver pickaxe"
icon_state = "spickaxe"