SWAT vest !!!DOES NOT BUFF SWAT!!! (#25236)

* our father

* forgot to mapmerge

* it's happening

_maps/shuttles/whiteship_meta.dmm

@@ -1041,8 +1041,8 @@
 	},
 /obj/item/clothing/gloves/color/black,
 /obj/item/clothing/gloves/color/black,
-/obj/item/clothing/suit/armor/vest,
+/obj/item/clothing/suit/armor/swat,
-/obj/item/clothing/suit/armor/vest,
+/obj/item/clothing/suit/armor/swat,
 /obj/structure/table,
 /obj/item/clothing/head/helmet/swat/nanotrasen,
 /obj/item/clothing/head/helmet/swat/nanotrasen,
@@ -2121,7 +2121,7 @@ ax
 aL
 bO
 ax
-dg
+df
 ac
 bx
 dj
@@ -2151,7 +2151,7 @@ ay
 aP
 ba
 ac
-de
+dd
 bx
 bQ
 bz

code/modules/awaymissions/corpse.dm

@@ -249,7 +249,7 @@
 /obj/effect/mob_spawn/human/syndicatesoldier
 	name = "Syndicate Operative"
 	uniform = /obj/item/clothing/under/syndicate
-	suit = /obj/item/clothing/suit/armor/vest
+	suit = /obj/item/clothing/suit/armor/swat
 	shoes = /obj/item/clothing/shoes/combat
 	gloves = /obj/item/clothing/gloves/combat
 	radio = /obj/item/device/radio/headset
@@ -406,7 +406,7 @@
 /obj/effect/mob_spawn/human/nanotrasensoldier
 	name = "Nanotrasen Private Security Officer"
 	uniform = /obj/item/clothing/under/rank/security
-	suit = /obj/item/clothing/suit/armor/vest
+	suit = /obj/item/clothing/suit/armor/swat
 	shoes = /obj/item/clothing/shoes/combat
 	gloves = /obj/item/clothing/gloves/combat
 	mask = /obj/item/clothing/mask/gas/sechailer/swat

code/modules/clothing/spacesuits/miscellaneous.dm

@@ -49,9 +49,8 @@ Contains:
 	icon_state = "heavy"
 	item_state = "swat_suit"
 	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/internals,/obj/item/weapon/kitchen/knife/combat)
-	armor = list(melee = 40, bullet = 30, laser = 30,energy = 30, bomb = 50, bio = 90, rad = 20, fire = 100, acid = 100)
+	armor = list(melee = 40, bullet = 30, laser = 30,energy = 30, bomb = 50, bio = 90, rad = 20, fire = 50, acid = 50)
 	strip_delay = 120
-	resistance_flags = FIRE_PROOF | ACID_PROOF
 
 /obj/item/clothing/head/helmet/space/beret
 	name = "officer's beret"

code/modules/clothing/suits/armor.dm

@@ -139,6 +139,14 @@
 	if (prob(hit_reflect_chance))
 		return 1
 
+/obj/item/clothing/suit/armor/swat
+	name = "MK.I SWAT Vest"
+	armor = list(melee = 40, bullet = 30, laser = 30,energy = 30, bomb = 50, bio = 90, rad = 20, fire = 50, acid = 50)
+	desc = "A lightweight vest variant of the infamous tactical suit."
+	icon_state = "swatvest"
+	item_state = "armor"
+	strip_delay = 120
+
 /obj/item/clothing/suit/armor/vest/det_suit
 	name = "armor"
 	desc = "An armored vest with a detective's badge on it."

code/modules/mob/living/simple_animal/corpse.dm

@@ -11,7 +11,7 @@
 /obj/effect/mob_spawn/human/corpse/syndicatesoldier
 	name = "Syndicate Operative"
 	uniform = /obj/item/clothing/under/syndicate
-	suit = /obj/item/clothing/suit/armor/vest
+	suit = /obj/item/clothing/suit/armor/swat
 	shoes = /obj/item/clothing/shoes/combat
 	gloves = /obj/item/clothing/gloves/combat
 	radio = /obj/item/device/radio/headset
@@ -107,7 +107,7 @@
 /obj/effect/mob_spawn/human/corpse/nanotrasensoldier
 	name = "Nanotrasen Private Security Officer"
 	uniform = /obj/item/clothing/under/rank/security
-	suit = /obj/item/clothing/suit/armor/vest
+	suit = /obj/item/clothing/suit/armor/swat
 	shoes = /obj/item/clothing/shoes/combat
 	gloves = /obj/item/clothing/gloves/combat
 	radio = /obj/item/device/radio/headset