diff --git a/code/datums/trading/ai.dm b/code/datums/trading/ai.dm index fbbaaa9c5ee..33a1c1147cb 100644 --- a/code/datums/trading/ai.dm +++ b/code/datums/trading/ai.dm @@ -94,7 +94,6 @@ /obj/item/storage/wallet = TRADER_THIS_TYPE, /obj/item/storage/photo_album = TRADER_THIS_TYPE, /obj/item/clothing/glasses = TRADER_SUBTYPES_ONLY, - /obj/item/clothing/glasses/threedglasses/fluff = TRADER_BLACKLIST_ALL, // Custom items /obj/item/clothing/glasses/hud = TRADER_BLACKLIST_ALL, //don't want mech/advanced stuff /obj/item/clothing/glasses/sunglasses/blindfold/tape = TRADER_BLACKLIST, // Literally just tape over someone's eyes /obj/item/clothing/glasses/chameleon = TRADER_BLACKLIST, // traitor stuff diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index e909c09b34a..506386ce003 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -259,16 +259,6 @@ All custom items with worn sprites must follow the contained sprite system: http w_class = ITEMSIZE_NORMAL -/obj/item/clothing/under/fluff/ellie_uniform //Cheery Blazer - Ellie Shoshanna - resilynn - name = "cheery blazer" - desc = "A cheery but professional outfit, mauve corduroys, blue blazer and a tie." - icon = 'icons/obj/custom_items/ellie_uniform.dmi' - icon_override = 'icons/obj/custom_items/ellie_uniform.dmi' - icon_state = "ellie_uniform" - item_state = "ellie_uniform" - contained_sprite = TRUE - - /obj/item/clothing/suit/storage/fluff/vira_coat //Designer Military Coat - Vira Bolivar - scheveningen name = "designer military coat" desc = "A dark funnel neck designer military-style dress coat, specially fitted on commission, clearly designed for a woman's figure. \ @@ -399,7 +389,7 @@ All custom items with worn sprites must follow the contained sprite system: http w_class = ITEMSIZE_NORMAL -/obj/item/flame/lighter/zippo/fluff/nikit_zippo //Vasili Mine Zippo - Nikit Vasili - simontheminer +/obj/item/flame/lighter/zippo/fluff/nikit_zippo //Vasili Mine Zippo - Nikit Vasili - sampletex desc = "An old looking zippo lighter with Vasili Mine Logo engraved on it. \"Good Luck Nikit\" is crudely scratched on under the logo in small writing." icon = 'icons/obj/custom_items/nikit_zippo.dmi' icon_override = 'icons/obj/custom_items/nikit_zippo.dmi' @@ -460,15 +450,6 @@ All custom items with worn sprites must follow the contained sprite system: http icon_state = "klavdiya_board" //thanks to kyres1 for the sprites -/obj/item/clothing/glasses/threedglasses/fluff/grunnus_glasses //3D glasses - Paul Grunnus - moom241 - desc = "A pair of old, beat up looking glasses, with red and blue lenses. Pretty archaic, but some might call it fashionable." - icon = 'icons/obj/custom_items/grunnus_glasses.dmi' - icon_override = 'icons/obj/custom_items/grunnus_glasses.dmi' - icon_state = "grunnus_glasses" - item_state = "grunnus_glasses" - contained_sprite = TRUE - - /obj/item/clothing/head/fluff/aavs_mask //Reflective Mask - Aavs Guwan - dronzthewolf name = "reflective mask" desc = "This odd mask and hood combination covers the wearer, and seems to be made of a one-way dome mirror and some old cloth or rope." @@ -788,7 +769,7 @@ All custom items with worn sprites must follow the contained sprite system: http item_state = "likho_labcoat" -/obj/item/clothing/suit/storage/toggle/fr_jacket/fluff/ramit_jacket //Winter Paramedic Jacket - Ra'mit Ma'zaira - simontheminer +/obj/item/clothing/suit/storage/toggle/fr_jacket/fluff/ramit_jacket //Winter Paramedic Jacket - Ra'mit Ma'zaira - sampletex name = "winter paramedic jacket" desc = "A custom made first responder coat. Inside is a warm fabric with the name \"Ra'Mit Ma'zaira\" sewn in by the collar." icon = 'icons/obj/custom_items/ramit_jacket.dmi' @@ -994,28 +975,6 @@ All custom items with worn sprites must follow the contained sprite system: http to_chat(user, "You pick out a song in the folder and read the lyrics: [pick(lyrics)]") -/obj/item/modular_computer/laptop/fluff/harrow_laptop //Developer's Laptop - Danny Harrow - brainos - name = "developer's laptop" - desc = "A portable computer, this one is covered edge-to-edge in stickers. Some stand out; such ones from a 2458 Game Jam, 2459 Game Jam and various title logos from obscure holovid series. Printed on the bottom panel \ - is \"Hello, world!\" in a bright, monospace font." - icon = 'icons/obj/custom_items/harrow_laptop.dmi' - icon_override = 'icons/obj/custom_items/harrow_laptop.dmi' - anchored = FALSE - screen_on = FALSE - icon_state = "laptop-closed" - -/obj/item/modular_computer/laptop/fluff/harrow_laptop/install_default_hardware() - ..() - processor_unit = new /obj/item/computer_hardware/processor_unit(src) - hard_drive = new /obj/item/computer_hardware/hard_drive(src) - network_card = new /obj/item/computer_hardware/network_card(src) - battery_module = new /obj/item/computer_hardware/battery_module(src) - battery_module.charge_to_full() - nano_printer = new /obj/item/computer_hardware/nano_printer(src) - nano_printer.max_paper = 10 - nano_printer.stored_paper = 5 - - /obj/item/clothing/accessory/poncho/fluff/ozuha_cape //Victory Cape - Skavoss Ozuha - dronzthewolf name = "victory cape" desc = "A finely crafted cape that combines Ozuha clan colors and Izweski nation colors, with inscriptions on the decorative brass paldrons reading something in Sinta'Unathi." @@ -2075,7 +2034,7 @@ All custom items with worn sprites must follow the contained sprite system: http contained_sprite = TRUE -/obj/item/storage/box/fancy/cigarettes/cigar/brianne_cigarettes //Martian Cigarette Case - Sean Brianne - Zelmana +/obj/item/storage/box/fancy/cigarettes/cigar/brianne_cigarettes //Martian Cigarette Case - Sean Brianne - zelmana name = "martian cigarette case" desc = "A small, personal cigarette tin. It holds cigarettes similar to a cigarette packet but has some nice flair." icon = 'icons/obj/custom_items/brianne_items.dmi' @@ -2087,7 +2046,8 @@ All custom items with worn sprites must follow the contained sprite system: http cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/dromedaryco contained_sprite = TRUE -/obj/item/clothing/glasses/sunglasses/fluff/lyod_snowglasses // Lyod snowglasses - Ravna Surtaeva - Sycmos + +/obj/item/clothing/glasses/sunglasses/fluff/lyod_snowglasses //Lyod snowglasses - Ravna Surtaeva - sycmos name = "\improper Lyod snowglasses" desc = "A pair of protective glasses hand-sculpted of reindeer antler, intended for use in arctic climates to protect from snow blindness." icon = 'icons/obj/custom_items/ravna_items.dmi' @@ -2097,7 +2057,7 @@ All custom items with worn sprites must follow the contained sprite system: http contained_sprite = TRUE flash_protection = FLASH_PROTECTION_NONE -/obj/item/clothing/suit/storage/toggle/fluff/prejoroub_fur_longcoat // prejoroub fur longcoat - Ravna Surtaeva - Sycmos +/obj/item/clothing/suit/storage/toggle/fluff/prejoroub_fur_longcoat //Prejoroub Fur Longcoat - Ravna Surtaeva - sycmos name = "prejoroub fur longcoat" desc = "A dense and heavy longcoat of dyed tenelote leather, with a liner and collar of prejoroub fur and decorative trimming throughout." icon = 'icons/obj/custom_items/ravna_items.dmi' @@ -2105,3 +2065,28 @@ All custom items with worn sprites must follow the contained sprite system: http icon_state = "ravna_coat" item_state = "ravna_coat" contained_sprite = TRUE + + +/obj/item/clothing/suit/armor/carrier/fluff/abbasi_carrier //Medinan Mercenary's Plate Carrier - Shirin Abbasi - persephoneq + name = "medinan mercenary's plate carrier" + desc = "A flashy and apparently well-made plate carrier. This one seems well-maintained, if quite worn-in. It's design is reminiscent of the ornate and intricate patterns of \ + Medinan make, though someone has written various colorful epithets such as 'AIM HERE' over the heart and 'KICK ME' on the back in Elyran Standard. A patch on the center depicts a \ + golden jackal with a challenging and cheerful grin, a chunk of phoron held between it's teeth. On the left shoulder, a much newer patch is sewn in depicting the insignia of the \ + SCC Chainlink. Beneath it is stitched 'ABBASI'." + icon = 'icons/obj/custom_items/abbasi_carrier.dmi' + icon_override = 'icons/obj/custom_items/abbasi_carrier.dmi' + icon_state = "abbasi_carrier" + item_state = "abbasi_carrier" + contained_sprite = TRUE + + +/obj/item/clothing/suit/storage/toggle/fluff/prejoroub_fur_longcoat //Renewed Antiquated Labcoat - Freedom Of Self Shackled By Unending Greed - lmwevil + name = "renewed antiquated labcoat" + desc = "An ancient labcoat from the Narrows, recently revitalized with extreme tailoring to become a symbol of unity between the Conglomerate and Dionae across the spur after the \ + allowance of Dionae as Executive Officers aboard the Horizon. It must have cost a substantial sum to fix the century old labcoat back up to scratch. On the left arm is a beautifully \ + sewn on patch that reads \"A block\"." + icon = 'icons/obj/custom_items/freedom_coat.dmi' + icon_override = 'icons/obj/custom_items/freedom_coat.dmi' + icon_state = "freedom_coat" + item_state = "freedom_coat" + contained_sprite = TRUE \ No newline at end of file diff --git a/icons/obj/custom_items/abbasi_carrier.dmi b/icons/obj/custom_items/abbasi_carrier.dmi new file mode 100644 index 00000000000..8c3a2160149 Binary files /dev/null and b/icons/obj/custom_items/abbasi_carrier.dmi differ diff --git a/icons/obj/custom_items/ellie_uniform.dmi b/icons/obj/custom_items/ellie_uniform.dmi deleted file mode 100644 index 4819cc57496..00000000000 Binary files a/icons/obj/custom_items/ellie_uniform.dmi and /dev/null differ diff --git a/icons/obj/custom_items/freedom_coat.dmi b/icons/obj/custom_items/freedom_coat.dmi new file mode 100644 index 00000000000..2e6e8f4c84f Binary files /dev/null and b/icons/obj/custom_items/freedom_coat.dmi differ diff --git a/icons/obj/custom_items/grunnus_glasses.dmi b/icons/obj/custom_items/grunnus_glasses.dmi deleted file mode 100644 index 0b36d283d4e..00000000000 Binary files a/icons/obj/custom_items/grunnus_glasses.dmi and /dev/null differ diff --git a/icons/obj/custom_items/harrow_laptop.dmi b/icons/obj/custom_items/harrow_laptop.dmi deleted file mode 100644 index d0456e7495f..00000000000 Binary files a/icons/obj/custom_items/harrow_laptop.dmi and /dev/null differ