Merge remote-tracking branch 'citadel/master' into clickcd_experimental

2020-07-23 10:36:46 -07:00
parent ffd44b78ba 4917fe378a
commit db24df58a0
43 changed files with 4089 additions and 2706 deletions
@@ -223,8 +223,8 @@
 /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 = "combat"
-	item_state = "blackgloves"
+	icon_state = "fightglovesblack"
+	item_state = "fightglovesblack"
 	siemens_coefficient = 0
 	permeability_coefficient = 0.05
 	strip_delay = 80