Merge branch 'master' into cube-world

2020-04-23 02:04:56 -04:00
parent e311aafbc0 af222768fe
commit c8b3032087
374 changed files with 5466 additions and 3233 deletions
@@ -21,6 +21,7 @@
 					/obj/item/clothing/head/helmet/blueshirt = 1,
 					/obj/item/clothing/suit/armor/vest/blueshirt = 1,
 					/obj/item/clothing/under/rank/security/officer/blueshirt = 1,
+				   /obj/item/clothing/gloves/tackler = 5,
 					/obj/item/ssword_kit = 1)
 	armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
 	resistance_flags = FIRE_PROOF