Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into override-override

2018-09-27 05:09:23 -05:00
parent 70d969c5cf 1b26196c52
commit 2daa197605
24 changed files with 143 additions and 50 deletions
@@ -241,7 +241,6 @@
 	icon_state = "fedcapofficer"
 	alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
 	item_state = "fedcapofficer_mob"
-	armor = list("melee" = 10, "bullet" = 10, "laser" = 10,"energy" = 10, "bomb" = 0, "bio" = 10, "rad" = 10, "fire" = 0, "acid" = 0)

 	//Variants
 /obj/item/clothing/head/caphat/formal/fedcover/medsci