shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
kevinz000
2020-03-21 09:53:39 -07:00
parent 761b4a2152 a924c98f69
commit 300c8e3c6d
135 changed files with 1070 additions and 530 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/suits/armor.dm
+9
View File
@@ -192,6 +192,15 @@
. = ..()
allowed = GLOB.detective_vest_allowed
/obj/item/clothing/suit/armor/vest/infiltrator
name = "insidious combat vest"
desc = "An insidious combat vest designed using Syndicate nanofibers to absorb the supreme majority of kinetic blows. Although it doesn't look like it'll do too much for energy impacts."
icon_state = "infiltrator"
item_state = "infiltrator"
armor = list("melee" = 30, "bullet" = 40, "laser" = 20, "energy" = 30, "bomb" = 70, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
resistance_flags = FIRE_PROOF | ACID_PROOF
strip_delay = 80
//All of the armor below is mostly unused
/obj/item/clothing/suit/armor/centcom