diff --git a/_maps/shuttles/syndicate/syndicate_litieguai.dmm b/_maps/shuttles/syndicate/syndicate_litieguai.dmm index 1330108a6874..a7e6bb4dbcf5 100644 --- a/_maps/shuttles/syndicate/syndicate_litieguai.dmm +++ b/_maps/shuttles/syndicate/syndicate_litieguai.dmm @@ -1410,9 +1410,9 @@ name = "armor locker"; req_access_txt = "5" }, -/obj/item/clothing/suit/armor/vest/marine/trauma, -/obj/item/clothing/suit/armor/vest/marine/trauma, -/obj/item/clothing/suit/armor/vest/marine/trauma, +/obj/item/clothing/suit/armor/vest/trauma, +/obj/item/clothing/suit/armor/vest/trauma, +/obj/item/clothing/suit/armor/vest/trauma, /obj/item/clothing/head/helmet/medical, /obj/item/clothing/head/helmet/medical, /obj/item/clothing/head/helmet/medical, diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm index 7bf283492efc..b5956ffe350d 100644 --- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm +++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm @@ -1377,7 +1377,7 @@ /obj/item/clothing/under/syndicate/medic/skirt, /obj/item/clothing/under/syndicate/medic, /obj/item/clothing/head/helmet/medical, -/obj/item/clothing/suit/armor/vest/marine/trauma, +/obj/item/clothing/suit/armor/vest/trauma, /obj/item/storage/belt/medical, /obj/item/storage/belt/medical/webbing, /obj/item/clothing/gloves/color/latex/nitrile/evil, @@ -5020,7 +5020,7 @@ /obj/item/clothing/under/syndicate/medic/skirt, /obj/item/clothing/under/syndicate/medic, /obj/item/clothing/head/helmet/medical, -/obj/item/clothing/suit/armor/vest/marine/trauma, +/obj/item/clothing/suit/armor/vest/trauma, /obj/item/antag_spawner/nuke_ops/borg_tele/medical/unlocked, /obj/item/storage/belt/medical, /obj/item/storage/belt/medical/webbing, @@ -5611,10 +5611,12 @@ /obj/item/gun/ballistic/automatic/ebr/no_mag{ pixel_x = -16; pixel_y = 7; + }, /obj/item/gun/ballistic/automatic/ebr/no_mag{ pixel_x = -9; pixel_y = 2; + }, /obj/item/ammo_box/magazine/ebr{ pixel_x = 10; @@ -7502,10 +7504,12 @@ /obj/item/gun/ballistic/shotgun/bulldog/no_mag{ pixel_x = -7; pixel_y = 7; + }, /obj/item/gun/ballistic/shotgun/bulldog/no_mag{ pixel_y = -3; pixel_x = 2; + }, /obj/machinery/light/directional/north, /obj/item/ammo_box/magazine/m12g{ @@ -8839,13 +8843,16 @@ /obj/item/gun/ballistic/automatic/smg/c20r/no_mag{ pixel_x = 2; pixel_y = 8; + }, /obj/item/gun/ballistic/automatic/smg/c20r/no_mag{ pixel_y = 3; + }, /obj/item/gun/ballistic/automatic/smg/c20r/no_mag{ pixel_y = -2; pixel_x = 3; + }, /obj/item/ammo_box/magazine/smgm45, /obj/item/ammo_box/magazine/smgm45, diff --git a/code/modules/clothing/factions/frontiersmen.dm b/code/modules/clothing/factions/frontiersmen.dm index a37200ad7655..9bac6c40a004 100644 --- a/code/modules/clothing/factions/frontiersmen.dm +++ b/code/modules/clothing/factions/frontiersmen.dm @@ -128,6 +128,8 @@ desc = "An olive-green and grey baseball hat, worn by cargo technicians working under the Frontiersmen. Even they have the rights for a cool cap!" icon_state = "frontiersoft" soft_type = "frontiersmen" + icon = 'icons/obj/clothing/faction/frontiersmen/head.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/frontiersmen/head.dmi' /obj/item/clothing/head/beret/sec/frontier name = "\improper Frontiersmen beret"