Skip to content

Commit

Permalink
UPP Helmet Fixes (#622)
Browse files Browse the repository at this point in the history 
Co-authored-by: Dumbgunner <[email protected]>
  • Loading branch information
@Max-023
Max-023 and Dumbgunner authored Dec 23, 2024
1 parent ca68979 commit b3b32a3
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 28 deletions.
55 changes: 27 additions & 28 deletions code/modules/clothing/head/helmet.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,21 +206,21 @@
GLOBAL_LIST_INIT(allowed_helmet_items, list(
// TOBACCO-RELATED
/obj/item/tool/lighter/random = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/tool/lighter/zippo = "helmet_lighter_zippo",
/obj/item/storage/box/matches = "helmet_matches",
/obj/item/storage/fancy/cigarettes/emeraldgreen = "helmet_cig_cig",
/obj/item/storage/fancy/cigarettes/kpack = "helmet_cig_kpack",
/obj/item/storage/fancy/cigarettes/lucky_strikes = "helmet_cig_ls",
/obj/item/storage/fancy/cigarettes/wypacket = "helmet_cig_wypack",
/obj/item/storage/fancy/cigarettes/lady_finger = "helmet_cig_lf",
/obj/item/storage/fancy/cigarettes/blackpack = "helmet_cig_blackpack",
/obj/item/storage/fancy/cigarettes/arcturian_ace = "helmet_cig_aapack",
/obj/item/storage/fancy/cigarettes/spirit = "helmet_cig_naspack",
/obj/item/storage/fancy/cigarettes/spirit/yellow = "helmet_cig_y_naspack",
/obj/item/storage/fancy/cigarettes/lucky_strikes_4 = "hat_cig_ls_mre",
/obj/item/storage/fancy/cigar/matchbook = "helmet_matches_mre",
/obj/item/clothing/mask/cigarette/cigar = "helmet_cig_cig",
/obj/item/clothing/mask/electronic_cigarette = "helmet_cig_cig",
/obj/item/tool/lighter/zippo = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/storage/box/matches = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/storage/fancy/cigarettes/emeraldgreen = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/storage/fancy/cigarettes/kpack = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/storage/fancy/cigarettes/lucky_strikes = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/storage/fancy/cigarettes/wypacket = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/storage/fancy/cigarettes/lady_finger = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/storage/fancy/cigarettes/blackpack = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/storage/fancy/cigarettes/arcturian_ace = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/storage/fancy/cigarettes/spirit = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/storage/fancy/cigarettes/spirit/yellow = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/storage/fancy/cigarettes/lucky_strikes_4 = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/storage/fancy/cigar/matchbook = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/clothing/mask/cigarette/cigar = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/clothing/mask/electronic_cigarette = HELMET_GARB_RELAY_ICON_STATE,

// CARDS
/obj/item/toy/deck = "helmet_card_deck",
Expand Down Expand Up @@ -286,7 +286,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(

// PREFERENCES GEAR
/obj/item/prop/helmetgarb/gunoil = "gunoil",
/obj/item/prop/helmetgarb/netting = "netting",
/obj/item/prop/helmetgarb/netting = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/prop/helmetgarb/spent_buckshot = "spent_buckshot",
/obj/item/prop/helmetgarb/spent_slug = "spent_slug",
/obj/item/prop/helmetgarb/spent_flech = "spent_flech",
Expand Down Expand Up @@ -319,18 +319,17 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
/obj/item/tool/pen/blue = "helmet_pen_blue",
/obj/item/tool/pen/red = "helmet_pen_red",
/obj/item/clothing/glasses/welding ="welding-h",
/obj/item/clothing/head/headband = "headbandgreen",
/obj/item/clothing/head/headband/tan = "headbandtan",
/obj/item/clothing/head/headband/red = "headbandred",
/obj/item/clothing/head/headband/brown = "helmet_headbandbrown",
/obj/item/clothing/head/headband/gray = "helmet_headbandgray",
/obj/item/clothing/head/headband/alpha = "helmet_headbandalpha",
/obj/item/clothing/head/headband/bravo = "helmet_headbandbravo",
/obj/item/clothing/head/headband/charlie = "helmet_headbandcharlie",
/obj/item/clothing/head/headband/delta = "helmet_headbanddelta",
/obj/item/clothing/head/headband/echo = "helmet_headbandecho",
/obj/item/clothing/head/headband/foxtrot = "helmet_headbandfoxtrot",
/obj/item/clothing/head/headband/foxtrot = "helmet_headbandintel",
/obj/item/clothing/head/headband = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/clothing/head/headband/tan = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/clothing/head/headband/red = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/clothing/head/headband/brown = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/clothing/head/headband/gray = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/clothing/head/headband/alpha = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/clothing/head/headband/bravo = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/clothing/head/headband/charlie = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/clothing/head/headband/delta = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/clothing/head/headband/echo = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/clothing/head/headband/foxtrot = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/tool/candle = "candle",
/obj/item/clothing/mask/facehugger/lamarr = "lamarr",
/obj/item/toy/crayon/red = "crayonred",
Expand Down
Binary file modified icons/mob/humans/onmob/helmet_garb.dmi
View file
Binary file not shown.

0 comments on commit b3b32a3

Please sign in to comment.