Merge branch 'master' into master

2019-07-06 16:03:17 +01:00
parent 7fa072030b bd675d3bae
commit cc39c9f896
34 changed files with 248 additions and 34 deletions
@@ -195,7 +195,7 @@
 /obj/item/clothing/gloves/krav_maga/combatglovesplus
 	name = "combat gloves plus"
 	desc = "These tactical gloves are fireproof and shock resistant, and using nanochip technology it teaches you the powers of krav maga."
-	icon_state = "black"
+	icon_state = "combat"
 	item_state = "blackglovesplus"
 	siemens_coefficient = 0
 	permeability_coefficient = 0.05