Skip to content

Commit

Permalink
hat operation
Browse files Browse the repository at this point in the history
  • Loading branch information
KoishiVibe committed Sep 16, 2024
1 parent 8e66c08 commit 901cc12
Showing 1 changed file with 158 additions and 38 deletions.
196 changes: 158 additions & 38 deletions code/modules/clothing/head/head.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@

/obj/item/clothing/head/cmcap
name = "patrol cap"
desc = "A casual cap issued as part of the non-combat uniform. While it only protects from the sun, it's much more comfortable than a helmet."
desc = "Service issue patrol cap. Has no protective qualities, but it's light and comfy. Also useful for smartgunners to keep their HMS unobstructed."
icon_state = "cap"
icon = 'icons/obj/items/clothing/cm_hats.dmi'
var/helmet_overlays[]
Expand All @@ -200,44 +200,164 @@
var/flags_marine_hat = HAT_GARB_OVERLAY|HAT_CAN_FLIP
var/obj/item/storage/internal/headgear/pockets
var/list/allowed_hat_items = list(
/obj/item/storage/fancy/cigarettes/emeraldgreen = "hat_cig_cig",
/obj/item/storage/fancy/cigarettes/kpack = "hat_cig_kpack",
/obj/item/storage/fancy/cigarettes/lucky_strikes = "hat_cig_ls",
/obj/item/storage/fancy/cigarettes/wypacket = "hat_cig_wypack",
/obj/item/storage/fancy/cigarettes/lady_finger = "hat_cig_lf",
/obj/item/storage/fancy/cigarettes/blackpack = "hat_cig_blackpack",
/obj/item/storage/fancy/cigarettes/arcturian_ace = "hat_cig_aapack",
/obj/item/tool/pen = "hat_pen_black",
/obj/item/tool/pen/blue = "hat_pen_blue",
/obj/item/tool/pen/red = "hat_pen_red",
/obj/item/clothing/glasses/welding = "welding-c",
/obj/item/clothing/glasses/mgoggles = HAT_GARB_RELAY_ICON_STATE,
/obj/item/clothing/glasses/mgoggles/prescription = HAT_GARB_RELAY_ICON_STATE,
/obj/item/clothing/glasses/mgoggles/black = HAT_GARB_RELAY_ICON_STATE,
/obj/item/clothing/glasses/mgoggles/orange = HAT_GARB_RELAY_ICON_STATE,
/obj/item/clothing/glasses/mgoggles/v2 = HAT_GARB_RELAY_ICON_STATE,
/obj/item/prop/helmetgarb/helmet_nvg = HAT_GARB_RELAY_ICON_STATE,
/obj/item/prop/helmetgarb/helmet_nvg/cosmetic = HAT_GARB_RELAY_ICON_STATE,
/obj/item/prop/helmetgarb/helmet_nvg/marsoc = HAT_GARB_RELAY_ICON_STATE,
/obj/item/clothing/head/headband = "hat_headbandgreen",
/obj/item/clothing/head/headband/tan = "hat_headbandtan",
/obj/item/clothing/head/headband/red = "hat_headbandred",
/obj/item/clothing/head/headband/brown = "hat_headbandbrown",
/obj/item/clothing/head/headband/gray = "hat_headbandgray",
/obj/item/clothing/head/headband/alpha = "hat_headbandalpha",
/obj/item/clothing/head/headband/bravo = "hat_headbandbravo",
/obj/item/clothing/head/headband/charlie = "hat_headbandcharlie",
/obj/item/clothing/head/headband/delta = "hat_headbanddelta",
/obj/item/clothing/head/headband/echo = "hat_headbandecho",
/obj/item/clothing/head/headband/foxtrot = "hat_headbandfoxtrot",
/obj/item/clothing/head/headband/foxtrot = "hat_headbandintel",
/obj/item/prop/helmetgarb/lucky_feather = "lucky_feather",
/obj/item/prop/helmetgarb/lucky_feather/blue = "lucky_feather_blue",
/obj/item/prop/helmetgarb/lucky_feather/purple = "lucky_feather_purple",
/obj/item/prop/helmetgarb/lucky_feather/yellow = "lucky_feather_yellow",
/obj/item/tool/pen/fountain = "fountainpen",
/obj/item/storage/fancy/cigarettes/emeraldgreen = "hat_cig_cig",
/obj/item/storage/fancy/cigarettes/kpack = "hat_cig_kpack",
/obj/item/storage/fancy/cigarettes/lucky_strikes = "hat_cig_ls",
/obj/item/storage/fancy/cigarettes/wypacket = "hat_cig_wypack",
/obj/item/storage/fancy/cigarettes/lady_finger = "hat_cig_lf",
/obj/item/storage/fancy/cigarettes/blackpack = "hat_cig_blackpack",
/obj/item/storage/fancy/cigarettes/arcturian_ace = "hat_cig_aapack",
/obj/item/tool/pen = "hat_pen_black",
/obj/item/tool/pen/blue = "hat_pen_blue",
/obj/item/tool/pen/red = "hat_pen_red",
/obj/item/clothing/glasses/welding = "welding-c",
/obj/item/clothing/glasses/mgoggles = HAT_GARB_RELAY_ICON_STATE,
/obj/item/clothing/glasses/mgoggles/prescription = HAT_GARB_RELAY_ICON_STATE,
/obj/item/clothing/glasses/mgoggles/black = HAT_GARB_RELAY_ICON_STATE,
/obj/item/clothing/glasses/mgoggles/orange = HAT_GARB_RELAY_ICON_STATE,
/obj/item/clothing/glasses/mgoggles/v2 = HAT_GARB_RELAY_ICON_STATE,
/obj/item/prop/helmetgarb/helmet_nvg = HAT_GARB_RELAY_ICON_STATE,
/obj/item/prop/helmetgarb/helmet_nvg/cosmetic = HAT_GARB_RELAY_ICON_STATE,
/obj/item/prop/helmetgarb/helmet_nvg/marsoc = HAT_GARB_RELAY_ICON_STATE,
/obj/item/clothing/head/headband = "hat_headbandgreen",
/obj/item/clothing/head/headband/tan = "hat_headbandtan",
/obj/item/clothing/head/headband/red = "hat_headbandred",
/obj/item/clothing/head/headband/brown = "hat_headbandbrown",
/obj/item/clothing/head/headband/gray = "hat_headbandgray",
/obj/item/clothing/head/headband/alpha = "hat_headbandalpha",
/obj/item/clothing/head/headband/bravo = "hat_headbandbravo",
/obj/item/clothing/head/headband/charlie = "hat_headbandcharlie",
/obj/item/clothing/head/headband/delta = "hat_headbanddelta",
/obj/item/clothing/head/headband/echo = "hat_headbandecho",
/obj/item/clothing/head/headband/foxtrot = "hat_headbandfoxtrot",
/obj/item/clothing/head/headband/foxtrot = "hat_headbandintel",
/obj/item/prop/helmetgarb/lucky_feather = "lucky_feather",
/obj/item/prop/helmetgarb/lucky_feather/blue = "lucky_feather_blue",
/obj/item/prop/helmetgarb/lucky_feather/purple = "lucky_feather_purple",
/obj/item/prop/helmetgarb/lucky_feather/yellow = "lucky_feather_yellow",
/obj/item/tool/pen/fountain = "fountainpen",

// CARDS
/obj/item/toy/deck = "helmet_card_deck",
/obj/item/toy/deck/uno = "helmet_card_uno",
/obj/item/toy/handcard = "helmet_card_card",
/obj/item/toy/handcard/aceofspades = "ace_of_spades",
/obj/item/toy/handcard/uno_reverse_red = "red_reverse",
/obj/item/toy/handcard/uno_reverse_blue = "blue_reverse",
/obj/item/toy/handcard/uno_reverse_yellow = "yellow_reverse",
/obj/item/toy/handcard/uno_reverse_purple = "purple_reverse",

// FOOD AND SNACKS
/obj/item/reagent_container/food/drinks/flask = "helmet_flask",
/obj/item/reagent_container/food/drinks/flask/marine = "helmet_flask",
/obj/item/reagent_container/food/snacks/eat_bar = "helmet_snack_eat",
/obj/item/reagent_container/food/snacks/packaged_burrito = "helmet_snack_burrito",
/obj/item/reagent_container/food/snacks/mushroompizzaslice = "pizza", // Fuck whoever put these under different paths for some REASON
/obj/item/reagent_container/food/snacks/vegetablepizzaslice = "pizza",
/obj/item/reagent_container/food/snacks/meatpizzaslice = "pizza",
/obj/item/reagent_container/food/snacks/packaged_burrito = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/reagent_container/food/snacks/packaged_hdogs = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/reagent_container/food/snacks/wrapped/chunk = "chunkbox",
/obj/item/reagent_container/food/snacks/donkpocket = "donkpocket",
/obj/item/reagent_container/food/snacks/wrapped/booniebars = "boonie-bars",
/obj/item/reagent_container/food/snacks/wrapped/barcardine = "barcardine-bars",


// EYEWEAR
/obj/item/clothing/glasses/sunglasses = "sunglasses",
/obj/item/clothing/glasses/sunglasses/prescription = "sunglasses",
/obj/item/clothing/glasses/sunglasses/aviator = "aviator",
/obj/item/clothing/glasses/sunglasses/big = "bigsunglasses",
/obj/item/clothing/glasses/sunglasses/sechud = "sechud",
/obj/item/clothing/glasses/eyepatch = "eyepatch",
/obj/item/clothing/glasses/regular/hipster = "persc-glasses",

// WALKMAN AND CASSETTES
/obj/item/device/cassette_tape/pop1 = "cassette_blue",
/obj/item/device/cassette_tape/pop2 = "cassette_rainbow",
/obj/item/device/cassette_tape/pop3 = "cassette_orange",
/obj/item/device/cassette_tape/pop4 = "cassette_pink_stripe",
/obj/item/device/cassette_tape/heavymetal = "cassette_red_black",
/obj/item/device/cassette_tape/hairmetal = "cassette_red_stripe",
/obj/item/device/cassette_tape/indie = "cassette_rising_sun",
/obj/item/device/cassette_tape/hiphop = "cassette_orange_blue",
/obj/item/device/cassette_tape/nam = "cassette_green",
/obj/item/device/cassette_tape/ocean = "cassette_ocean",
/obj/item/storage/pouch/cassette = "cassette_pouch",

// PREFERENCES GEAR
/obj/item/prop/helmetgarb/gunoil = "gunoil",
/obj/item/prop/helmetgarb/netting = "netting",
/obj/item/prop/helmetgarb/spent_buckshot = "spent_buckshot",
/obj/item/prop/helmetgarb/spent_slug = "spent_slug",
/obj/item/prop/helmetgarb/spent_flech = "spent_flech",
/obj/item/prop/helmetgarb/cartridge = "cartridge",
/obj/item/prop/helmetgarb/prescription_bottle = "prescription_bottle",
/obj/item/prop/helmetgarb/raincover = "raincover",
/obj/item/prop/helmetgarb/camocover = "camocover",
/obj/item/prop/helmetgarb/rabbitsfoot = "rabbitsfoot",
/obj/item/prop/helmetgarb/rosary = "helmet_rosary", // This one was already in the game for some reason, but never had an object
/obj/item/prop/helmetgarb/lucky_feather = "lucky_feather",
/obj/item/prop/helmetgarb/lucky_feather/blue = "lucky_feather_blue",
/obj/item/prop/helmetgarb/lucky_feather/purple = "lucky_feather_purple",
/obj/item/prop/helmetgarb/lucky_feather/yellow = "lucky_feather_yellow",
/obj/item/prop/helmetgarb/trimmed_wire = "trimmed_wire",
/obj/item/prop/helmetgarb/helmet_gasmask = "helmet_gasmask",
/obj/item/prop/helmetgarb/helmet_gasmask/upp = "helmet_uppgasmask",
/obj/item/prop/helmetgarb/flair_initech = "flair_initech",
/obj/item/prop/helmetgarb/flair_io = "flair_io",
/obj/item/prop/helmetgarb/flair_peace ="flair_peace_smiley",
/obj/item/prop/helmetgarb/flair_uscm = "flair_uscm",
/obj/item/prop/helmetgarb/bullet_pipe = "bullet_pipe",
/obj/item/prop/helmetgarb/spacejam_tickets = "tickets_to_space_jam",
/obj/item/prop/helmetgarb/family_photo = "family_photo",
/obj/item/prop/helmetgarb/compass = "compass",
/obj/item/prop/helmetgarb/bug_spray = "bug_spray",

// MISC
/obj/item/tool/pen = "helmet_pen_black",
/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/tool/candle = "candle",
/obj/item/clothing/mask/facehugger/lamarr = "lamarr",
/obj/item/toy/crayon/red = "crayonred",
/obj/item/toy/crayon/orange = "crayonorange",
/obj/item/toy/crayon/yellow = "crayonyellow",
/obj/item/toy/crayon/green = "crayongreen",
/obj/item/toy/crayon/blue = "crayonblue",
/obj/item/toy/crayon/purple = "crayonpurple",
/obj/item/toy/crayon/rainbow = "crayonrainbow",
/obj/item/paper = "paper",
/obj/item/device/flashlight/flare = "flare",
/obj/item/clothing/head/headset = "headset",
/obj/item/clothing/accessory/patch = "uscmpatch",
/obj/item/clothing/accessory/patch/falcon = "falconspatch",
/obj/item/clothing/accessory/patch/devils = "devilspatch",
/obj/item/ammo_magazine/handful = "bullet",
/obj/item/prop/helmetgarb/chaplain_patch = "chaplain_patch",
/obj/item/tool/pen/fountain = "fountainpen",

// MEDICAL
/obj/item/stack/medical/bruise_pack ="brutepack (bandages)",
/obj/item/stack/medical/ointment = "ointment",
/obj/item/tool/surgery/scalpel = "scalpel",
/obj/item/reagent_container/hypospray/autoinjector = "helmet_injector",
/obj/item/storage/pill_bottle/packet = "brutepack (bandages)"
)
var/storage_slots = 1
var/storage_slots = 2
var/storage_slots_reserved_for_garb = 1
var/storage_max_w_class = SIZE_TINY
var/storage_max_storage_space = 4
Expand Down

0 comments on commit 901cc12

Please sign in to comment.