diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm index 1ebfe3d028af..9f0c486aad2c 100644 --- a/_maps/shuttles/inteq/inteq_colossus.dmm +++ b/_maps/shuttles/inteq/inteq_colossus.dmm @@ -832,10 +832,6 @@ /obj/effect/turf_decal/corner/opaque/yellow, /obj/effect/decal/cleanable/dirt, /obj/item/clothing/suit/armor/vest/bulletproof, -/obj/item/clothing/head/warden/drill{ - desc = "A special armored campaign hat with the IRMG insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection."; - name = "master at arms' campaign hat" - }, /obj/item/megaphone/sec, /obj/effect/turf_decal/corner/opaque/brown{ dir = 4 @@ -843,6 +839,8 @@ /obj/item/storage/belt/security/webbing/inteq, /obj/item/storage/belt/military/assault, /obj/item/reagent_containers/spray/pepper, +/obj/item/clothing/head/warden/inteq, +/obj/item/clothing/suit/armor/vest/security/warden/inteq, /turf/open/floor/plasteel/dark, /area/ship/security) "iT" = ( diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index 24e272c4d2b5..76cafb956cdd 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -1920,16 +1920,14 @@ /obj/effect/turf_decal/corner/opaque/yellow, /obj/effect/decal/cleanable/dirt, /obj/item/clothing/suit/armor/vest/bulletproof, -/obj/item/clothing/head/warden/drill{ - desc = "A special armored campaign hat with the IRMG insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection."; - name = "master at arms' campaign hat" - }, /obj/item/megaphone/sec, /obj/structure/sign/poster/contraband/eoehoma{ pixel_y = -32 }, /obj/item/storage/belt/security/webbing/inteq/alt, /obj/item/storage/belt/security/webbing/inteq, +/obj/item/clothing/head/warden/inteq, +/obj/item/clothing/suit/armor/vest/security/warden/inteq, /turf/open/floor/plasteel/dark, /area/ship/security) "ms" = ( diff --git a/_maps/shuttles/inteq/inteq_vaquero.dmm b/_maps/shuttles/inteq/inteq_vaquero.dmm index e65b103e6ebe..340eb8ec6739 100644 --- a/_maps/shuttles/inteq/inteq_vaquero.dmm +++ b/_maps/shuttles/inteq/inteq_vaquero.dmm @@ -1971,10 +1971,6 @@ /obj/effect/turf_decal/corner/opaque/yellow, /obj/effect/decal/cleanable/dirt, /obj/item/clothing/suit/armor/vest/bulletproof, -/obj/item/clothing/head/warden/drill{ - desc = "A special armored campaign hat with the IRMG insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection."; - name = "master at arms' campaign hat" - }, /obj/item/megaphone/sec, /obj/effect/turf_decal/corner/opaque/brown{ dir = 4 @@ -1986,6 +1982,8 @@ }, /obj/machinery/power/apc/auto_name/directional/east, /obj/machinery/light/small/directional/south, +/obj/item/clothing/head/warden/inteq, +/obj/item/clothing/suit/armor/vest/security/warden/inteq, /turf/open/floor/plasteel/dark, /area/ship/security) "Eh" = ( diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 0c61c587044f..9392425de555 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -216,6 +216,11 @@ dog_fashion = /datum/dog_fashion/head/cowboy +/obj/item/clothing/head/warden/inteq + name = "master at arms' campaign hat" + desc = "A special armored campaign hat with the IRMG insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection." + icon_state = "maahat" + /obj/item/clothing/head/warden/drill name = "warden's campaign hat" desc = "A special armored campaign hat with the security insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection." diff --git a/code/modules/clothing/outfits/factions/inteq.dm b/code/modules/clothing/outfits/factions/inteq.dm index 48702c064447..49512039d4c6 100644 --- a/code/modules/clothing/outfits/factions/inteq.dm +++ b/code/modules/clothing/outfits/factions/inteq.dm @@ -188,12 +188,12 @@ job_icon = "warden" ears = /obj/item/radio/headset/inteq/alt + head = /obj/item/clothing/head/warden/inteq uniform = /obj/item/clothing/under/syndicate/inteq - head = /obj/item/clothing/head/beret/sec/hos/inteq glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq mask = /obj/item/clothing/mask/gas/sechailer/inteq belt = /obj/item/storage/belt/military/assault - suit = /obj/item/clothing/suit/armor/vest/alt + suit = /obj/item/clothing/suit/armor/vest/security/warden/inteq dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq shoes = /obj/item/clothing/shoes/combat gloves = /obj/item/clothing/gloves/combat diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 5bd84e801382..c3787de67e83 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -112,6 +112,11 @@ resistance_flags = FLAMMABLE dog_fashion = null +/obj/item/clothing/suit/armor/vest/security/warden/inteq + name = "master at arms' armored coat" + desc = "A brown armored coat with a bulletproof vest over it, usually worn by the Master At Arms of the IRMG." + icon_state = "maacoat" + /obj/item/clothing/suit/armor/vest/security/warden/alt name = "warden's armored jacket" desc = "A white jacket with silver rank pips and body armor strapped on top." diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi index 78b8033a2e35..4c6dd4f78bcf 100644 Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ diff --git a/icons/mob/clothing/eyes.dmi b/icons/mob/clothing/eyes.dmi index 5f7fa454a218..12ebf87128c3 100644 Binary files a/icons/mob/clothing/eyes.dmi and b/icons/mob/clothing/eyes.dmi differ diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index e6dd95288038..0c79696e569a 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/suits/armor.dmi b/icons/mob/clothing/suits/armor.dmi index 43440753b4f7..c739d99d2f38 100644 Binary files a/icons/mob/clothing/suits/armor.dmi and b/icons/mob/clothing/suits/armor.dmi differ diff --git a/icons/mob/clothing/under/syndicate.dmi b/icons/mob/clothing/under/syndicate.dmi index b8293f7cb440..cc5e484b89c4 100644 Binary files a/icons/mob/clothing/under/syndicate.dmi and b/icons/mob/clothing/under/syndicate.dmi differ diff --git a/icons/mob/species/misc/digitigrade.dmi b/icons/mob/species/misc/digitigrade.dmi index b937694ec240..57d70696b850 100644 Binary files a/icons/mob/species/misc/digitigrade.dmi and b/icons/mob/species/misc/digitigrade.dmi differ diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi index 24cdcaed7839..65a951047a35 100644 Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index 10e7be38f19f..0b7af59b91e4 100644 Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index a96fa819bc3e..ce0924a83761 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits/armor.dmi b/icons/obj/clothing/suits/armor.dmi index 758c4836aeb0..aad247e5f7b3 100644 Binary files a/icons/obj/clothing/suits/armor.dmi and b/icons/obj/clothing/suits/armor.dmi differ diff --git a/icons/obj/clothing/under/syndicate.dmi b/icons/obj/clothing/under/syndicate.dmi index 3a0b6ff996b7..02d8e138b970 100644 Binary files a/icons/obj/clothing/under/syndicate.dmi and b/icons/obj/clothing/under/syndicate.dmi differ