diff --git a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm index feef647c1142..29a64340fe3d 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm @@ -12703,9 +12703,6 @@ /obj/item/clothing/suit/armor/vest/marine/heavy, /obj/item/clothing/suit/armor/vest/marine/medium, /obj/item/clothing/suit/armor/vest/marine/medium, -/obj/item/clothing/head/helmet/marine/security, -/obj/item/clothing/head/helmet/marine, -/obj/item/clothing/head/helmet/marine, /obj/item/clothing/suit/armor/vest/bulletproof, /obj/item/clothing/suit/armor/vest/bulletproof, /obj/item/clothing/head/helmet/plate, diff --git a/code/modules/cargo/packs/spacesuit_armor.dm b/code/modules/cargo/packs/spacesuit_armor.dm index 612f530d4137..ea8aa2684847 100644 --- a/code/modules/cargo/packs/spacesuit_armor.dm +++ b/code/modules/cargo/packs/spacesuit_armor.dm @@ -141,7 +141,7 @@ desc = "One set of well-rounded tactical armor. While it does not protect the limbs, the vest is fairly durable. The set includes a helmet and vest." cost = 1500 contains = list(/obj/item/clothing/suit/armor/vest/marine, - /obj/item/clothing/head/helmet/marine) + /obj/item/clothing/head/helmet/bulletproof/x11) crate_name = "armor crate" crate_type = /obj/structure/closet/crate/secure/plasma @@ -150,6 +150,6 @@ desc = "One set of well-rounded medium tactical body armor. Plates are attached to the vest and cover the limbs. The set includes a helmet and chestpiece." cost = 3000 contains = list(/obj/item/clothing/suit/armor/vest/marine/medium, - /obj/item/clothing/head/helmet/marine) + /obj/item/clothing/head/helmet/bulletproof/x11) crate_name = "armor crate" crate_type = /obj/structure/closet/crate/secure/plasma diff --git a/code/modules/clothing/factions/frontiersmen.dm b/code/modules/clothing/factions/frontiersmen.dm index 946601ce1d5f..7c4857823260 100644 --- a/code/modules/clothing/factions/frontiersmen.dm +++ b/code/modules/clothing/factions/frontiersmen.dm @@ -190,12 +190,18 @@ resistance_flags = FIRE_PROOF armor = list("melee" = 15, "bullet" = 60, "laser" = 10, "energy" = 10, "bomb" = 40, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50) -/obj/item/clothing/head/helmet/marine/frontier +/obj/item/clothing/head/helmet/frontier name = "frontiersmen reinforced helmet" desc = "A reinforced Frontiersmen X-11. The front plate has a small window to let the user see." icon_state = "marine_frontier" icon = 'icons/obj/clothing/faction/frontiersmen/head.dmi' mob_overlay_icon = 'icons/mob/clothing/faction/frontiersmen/head.dmi' + armor = list("melee" = 35, "bullet" = 55, "laser" = 45, "energy" = 25, "bomb" = 30, "bio" = 75, "fire" = 40, "acid" = 50) + slowdown = 0.1 + min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT + clothing_flags = STOPSPRESSUREDAMAGE | SNUG_FIT | BLOCK_GAS_SMOKE_EFFECT | ALLOWINTERNALS + resistance_flags = FIRE_PROOF | ACID_PROOF + flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF | SEALS_EYES //////////// //Glasses// diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 93185618c33f..75103c5f524a 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -229,38 +229,6 @@ ) content_overlays = TRUE -/obj/item/clothing/head/helmet/marine - name = "tactical combat helmet" - desc = "A tactical black helmet, sealed from outside hazards with a reinforced visor." - icon_state = "marine_command" - item_state = "helmetalt" - armor = list("melee" = 35, "bullet" = 55, "laser" = 45, "energy" = 25, "bomb" = 30, "bio" = 75, "fire" = 40, "acid" = 50) - slowdown = 0.1 - min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT - clothing_flags = STOPSPRESSUREDAMAGE | SNUG_FIT | BLOCK_GAS_SMOKE_EFFECT | ALLOWINTERNALS - resistance_flags = FIRE_PROOF | ACID_PROOF - flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF | SEALS_EYES - can_flashlight = TRUE - dog_fashion = null - -/obj/item/clothing/head/helmet/marine/Initialize(mapload) - set_attached_light(new /obj/item/flashlight/seclite) - update_helmlight() - update_appearance() - . = ..() - -/obj/item/clothing/head/helmet/marine/security - name = "marine heavy helmet" - icon_state = "marine_security" - -/obj/item/clothing/head/helmet/marine/engineer - name = "marine utility helmet" - icon_state = "marine_engineer" - -/obj/item/clothing/head/helmet/marine/medic - name = "marine medic helmet" - icon_state = "marine_medic" - /obj/item/clothing/head/helmet/old name = "degrading helmet" desc = "Standard issue security helmet. Due to degradation the helmet's visor obstructs the users ability to see long distances." diff --git a/code/modules/clothing/outfits/ert/frontiersmen_ert.dm b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm index 7ec649bedf75..edbf57d08db4 100644 --- a/code/modules/clothing/outfits/ert/frontiersmen_ert.dm +++ b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm @@ -273,7 +273,7 @@ /datum/outfit/job/frontiersmen/ert/sentry name = "ERT - Frontiersman Sentry (SKM-24v LMG)" - head = /obj/item/clothing/head/helmet/marine/frontier + head = /obj/item/clothing/head/helmet/frontier mask = /obj/item/clothing/mask/balaclava suit = /obj/item/clothing/suit/armor/vest/marine/frontier suit_store = /obj/item/gun/ballistic/automatic/hmg/skm_lmg/drum_mag diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 198e36884c88..f3fd5dc403a9 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -62,8 +62,8 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS cold_protection = CHEST|GROIN|LEGS|ARMS heat_protection = CHEST|GROIN|LEGS|ARMS - armor = list("melee" = 35, "bullet" = 55, "laser" = 45, "energy" = 25, "bomb" = 30, "bio" = 75, "fire" = 40, "acid" = 50) - slowdown = 0.1 + armor = list("melee" = 35, "bullet" = 50, "laser" = 45, "energy" = 25, "bomb" = 30, "bio" = 75, "fire" = 40, "acid" = 50) + slowdown = 0.4 /obj/item/clothing/suit/armor/vest/marine/heavy name = "heavy tactical armor vest" @@ -71,8 +71,8 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS cold_protection = CHEST|GROIN|LEGS|ARMS heat_protection = CHEST|GROIN|LEGS|ARMS - armor = list("melee" = 60, "bullet" = 75, "laser" = 55, "energy" = 25, "bomb" = 50, "bio" = 75, "fire" = 40, "acid" = 50) - slowdown = 0.5 + armor = list("melee" = 60, "bullet" = 60, "laser" = 55, "energy" = 25, "bomb" = 50, "bio" = 75, "fire" = 40, "acid" = 50) + slowdown = 0.8 /obj/item/clothing/suit/armor/vest/old name = "degrading armor vest"