unspaces swat armor and cargo

MemeSnorfer · Nov 1, 2024 · df0e858 · df0e858
1 parent 271fbd8
commit df0e858
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 34 deletions.
diff --git a/code/modules/cargo/packs/spacesuit_armor.dm b/code/modules/cargo/packs/spacesuit_armor.dm
@@ -86,16 +86,6 @@
 	crate_type = /obj/structure/closet/crate/secure/engineering
 	faction = FACTION_NT
 
-/datum/supply_pack/spacesuit_armor/swat
-	name = "SWAT Crate"
-	desc = "Contains one fullbody set of tough, fireproof, pressurized suit designed in a joint effort by IS-ERI and Nanotrasen. The set contains a suit, helmet, and combat belt."
-	cost = 3500
-	contains = list(/obj/item/clothing/head/helmet/swat/nanotrasen,
-					/obj/item/clothing/suit/space/swat,
-					/obj/item/storage/belt/military/assault)
-	crate_name = "swat crate"
-	crate_type = /obj/structure/closet/crate/secure/gear
-
 /*
 		Non-spaceworthy (armor)
 */
@@ -135,3 +125,12 @@
 	contains = list(/obj/item/clothing/suit/armor/laserproof)
 	crate_name = "reflector vest crate"
 	crate_type = /obj/structure/closet/crate/secure/plasma
+
+/datum/supply_pack/spacesuit_armor/swat
+    name = "SWAT Crate"
+    desc = "Contains one fullbody set of flexible yet bulky armor designed in a joint effort by Vigilitas and Nanotrasen."
+    cost = 2000
+    contains = list(/obj/item/clothing/head/helmet/swat,
+                    /obj/item/clothing/suit/armor/swat)
+    crate_name = "swat crate"
+    crate_type = /obj/structure/closet/crate/secure/gear
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
@@ -324,19 +324,13 @@
 	icon_state = "justice2"
 
 /obj/item/clothing/head/helmet/swat
-	name = "\improper SWAT helmet"
-	desc = "An extremely robust, space-worthy helmet in a nefarious red and black stripe pattern."
-	icon_state = "swatsyndie"
-	item_state = "swatsyndie"
-	armor = list("melee" = 40, "bullet" = 35, "laser" = 35,"energy" = 40, "bomb" = 50, "bio" = 90, "rad" = 20, "fire" = 100, "acid" = 100)
-	cold_protection = HEAD
-	min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
-	heat_protection = HEAD
-	max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
-	clothing_flags = STOPSPRESSUREDAMAGE
-	strip_delay = 80
-	resistance_flags = FIRE_PROOF | ACID_PROOF
-	dog_fashion = null
+    name = "\improper SWAT helmet"
+    desc = "An extremely robust helmet in a nefarious red and black stripe pattern."
+    icon_state = "swatsyndie"
+    item_state = "swatsyndie"
+    strip_delay = 80
+    resistance_flags = FIRE_PROOF | ACID_PROOF
+    dog_fashion = null
 
 /obj/item/clothing/head/helmet/police
 	name = "police officer's hat"

diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -44,17 +44,6 @@ Contains:
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/deathsquad
 	dog_fashion = /datum/dog_fashion/back/deathsquad
 
-	//NEW SWAT suit
-/obj/item/clothing/suit/space/swat
-	name = "MK.I SWAT Suit"
-	desc = "A tactical space suit first developed in a joint effort by the defunct IS-ERI and Nanotrasen in 20XX for military space operations. A tried and true workhorse, it is very difficult to move in but offers robust protection against all threats!"
-	icon_state = "heavy"
-	item_state = "swat_suit"
-	allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/melee/knife/combat)
-	armor = list("melee" = 40, "bullet" = 30, "laser" = 30,"energy" = 40, "bomb" = 50, "bio" = 90, "rad" = 20, "fire" = 100, "acid" = 100)
-	strip_delay = 120
-	resistance_flags = FIRE_PROOF | ACID_PROOF
-
 /obj/item/clothing/head/helmet/space/beret
 	name = "CentCom officer's beret"
 	desc = "An armored beret commonly used by special operations officers. Uses advanced force field technology to protect the head from space."

diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
@@ -462,3 +462,12 @@
 /obj/item/clothing/suit/toggle/armor/vest/centcom_formal/Initialize()
 	. = ..()
 	allowed = GLOB.security_wintercoat_allowed
+
+/obj/item/clothing/suit/armor/swat
+    name = "MK.I SWAT Suit"
+    desc = "A tactical armored suit first developed in a joint effort by Vigilitas and Nanotrasen in 4XX for military operations. A tried and true workhorse, it is very difficult to move in but offers robust protection against all threats!"
+    icon_state = "heavy"
+    item_state = "swat_suit"
+    body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+    strip_delay = 120
+    resistance_flags = FIRE_PROOF | ACID_PROOF