Skip to content

Commit

Permalink
sg sprites + flak jacket accessory (redone) (#292)
Browse files Browse the repository at this point in the history
Co-authored-by: DexterDude <[email protected]>
  • Loading branch information
AndroBetel and DexterDude committed Jul 22, 2024
1 parent 8547eaf commit f9fe348
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 0 deletions.
5 changes: 5 additions & 0 deletions code/modules/client/preferences_gear.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
24 changes: 24 additions & 0 deletions code/modules/clothing/under/ties.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 <b>using it in hand</b>.")

/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
Binary file modified icons/mob/humans/onmob/suit_1.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/ties.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/cm_suits.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/ties.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/ties_overlay.dmi
Binary file not shown.

0 comments on commit f9fe348

Please sign in to comment.