Merge branch 'master' into wounds-part-2

2020-08-02 18:10:31 +01:00
parent 9721025582 79590f6dc9
commit 03d01d917f
25 changed files with 169 additions and 124 deletions
@@ -73,6 +73,9 @@
 	item_state = "g_suit"
 	can_adjust = FALSE

+/obj/item/clothing/under/syndicate/camo/cosmetic
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+
 /obj/item/clothing/under/syndicate/soviet
 	name = "Ratnik 5 tracksuit"
 	desc = "Badly translated labels tell you to clean this in Vodka. Great for squatting in."