Merge branch 'master' into Medical-Turtleneck

2018-02-06 07:47:29 +08:00
parent c8468ed7a7 7b46f951cc
commit acec5bc6ad
1073 changed files with 103850 additions and 164911 deletions
@@ -0,0 +1,7 @@
+/obj/item/clothing/under/syndicate/cosmetic
+	name = "tactitool turtleneck"
+	desc = "Just looking at it makes you want to buy an SKS, go into the woods, and -operate-."
+	icon_state = "tactifool"
+	item_state = "bl_suit"
+	item_color = "tactifool"
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)