diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 868d33a332..9b8b319731 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -1073,3 +1073,8 @@ var/global/list/gear_datums_by_name = list() display_name = "Cut-throat razor" path = /obj/item/weapon/straight_razor cost = 3 + +/datum/gear/misc/flak + display_name = "M67 flak jacket" + path = /obj/item/clothing/accessory/flak + cost = 3 diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm index 23080104a4..e1c029bae3 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/ties.dm @@ -937,3 +937,27 @@ icon = 'icons/obj/items/clothing/ties.dmi' icon_state = "owlf_vest" item_state = "owlf_vest" + +/obj/item/clothing/accessory/flak + name = "M67 flak vest" + desc = "An older model of flak jacket worn by combat support personnel such as dropship crew, or occasionally by smartgunners. Much comfier than its M70 successor, and can be worn under most combat armor, however, the ballistic protection leaves much to be desired." + icon_state = "flak" + item_state = "flak" + w_class = SIZE_MEDIUM + var/tucked_in = FALSE + +/obj/item/clothing/accessory/flak/get_examine_text(mob/user) + . = ..() + . += SPAN_NOTICE("You can wear it differently by using it in hand.") + +/obj/item/clothing/accessory/flak/attack_self(mob/user) + ..() + + tucked_in = !tucked_in + if(tucked_in) + icon_state = "flakslim" + user.visible_message(SPAN_NOTICE("[user] tucks in [src]'s sleeves."), SPAN_NOTICE("You tuck in [src]'s sleeves.")) + else + icon_state = initial(icon_state) + user.visible_message(SPAN_NOTICE("[user] decides to keep [src] nice and puffy."), SPAN_NOTICE("You decide to keep [src] nice and puffy.")) + item_state = icon_state diff --git a/icons/mob/humans/onmob/suit_1.dmi b/icons/mob/humans/onmob/suit_1.dmi index 8a9424ff15..279ce1ca7b 100644 Binary files a/icons/mob/humans/onmob/suit_1.dmi and b/icons/mob/humans/onmob/suit_1.dmi differ diff --git a/icons/mob/humans/onmob/ties.dmi b/icons/mob/humans/onmob/ties.dmi index f277dc02a7..4573d24239 100644 Binary files a/icons/mob/humans/onmob/ties.dmi and b/icons/mob/humans/onmob/ties.dmi differ diff --git a/icons/obj/items/clothing/cm_suits.dmi b/icons/obj/items/clothing/cm_suits.dmi index bc012f71ca..016a1cd6c0 100644 Binary files a/icons/obj/items/clothing/cm_suits.dmi and b/icons/obj/items/clothing/cm_suits.dmi differ diff --git a/icons/obj/items/clothing/ties.dmi b/icons/obj/items/clothing/ties.dmi index 17118d8760..6a4677c5f6 100644 Binary files a/icons/obj/items/clothing/ties.dmi and b/icons/obj/items/clothing/ties.dmi differ diff --git a/icons/obj/items/clothing/ties_overlay.dmi b/icons/obj/items/clothing/ties_overlay.dmi index 599c89484b..ab2276b00d 100644 Binary files a/icons/obj/items/clothing/ties_overlay.dmi and b/icons/obj/items/clothing/ties_overlay.dmi differ