Merge remote-tracking branch 'upstream/dev' into inventoryfix

Conflicts: code/modules/organs/organ_external.dm
2026-07-19 11:02:31 +01:00 · 2015-03-31 02:08:33 -04:00
parent 5484a30a13 65f61122b5
commit 398459c2e7
143 changed files with 6550 additions and 4629 deletions
@@ -118,6 +118,8 @@
 	origin_tech = "materials=4;phorontech=3;engineering=3"
 	desc = "A rock cutter that uses bursts of hot plasma. You could use it to cut limbs off of xenos! Or, you know, mine stuff."
 	drill_verb = "cutting"
+	sharp = 1
+	edge = 1

 /obj/item/weapon/pickaxe/diamond
 	name = "diamond pickaxe"