Merge pull request #2065 from Zuhayr/master

Four custom items plus custom items config file.

code/modules/customitems/item_defines.dm

@@ -67,6 +67,15 @@ hi
 	desc = "A neatly folded handkerchief embroidered with a 'M'."
 	icon_state = "maurice_bedford_1"
 
+/obj/item/weapon/book/fluff/johnathan_falcian_1
+	name = "sketchbook"
+	desc = "A small, well-used sketchbook."
+	icon = 'custom_items.dmi'
+	icon_state = "johnathan_notebook"
+	dat = "In the notebook there are numerous drawings of various crew-mates, locations, and scenes on the ship. They are of fairly good quality."
+	author = "Johnathan Falcian"
+	title = "Falcian's sketchbook"
+
 //////////////////////////////////
 ////////// Usable Items //////////
 //////////////////////////////////
@@ -393,6 +402,19 @@ hi
 	icon = 'custom_items.dmi'
 	icon_state = "ian_colm_1"
 
+////// Medical eyepatch - Thysse Ezinwa - Jadepython
+/obj/item/clothing/glasses/eyepatch/fluff/thysse_1
+	name = "medical eyepatch"
+	desc = "On the strap, EZINWA is written in white block letters."
+
+////// Safety Goggles - Arjun Chopra - MindPhyre - APPROVED
+/obj/item/clothing/glasses/fluff/arjun_chopra_1
+	name = "safety goggles"
+	desc = "A used pair of leather safety goggles."
+	icon = 'custom_items.dmi'
+	icon_state = "arjun_chopra"
+	item_state = "arjun_chopra"
+
 //////////// Hats ////////////
 
 /obj/item/clothing/head/secsoft/fluff/swatcap //deusdactyl: James Girard
@@ -523,7 +545,6 @@ hi
 	sensor_mode = 3
 	flags = FPRINT | TABLEPASS
 
-
 //Suit roll-down toggle.
 /obj/item/clothing/under/fluff/jane_sidsuit/verb/toggle_zipper()
 	set name = "Toggle Jumpsuit Zipper"
@@ -544,6 +565,16 @@ hi
 	src.item_state = "[color]"
 	usr.update_inv_w_uniform()
 
+////// Wyatt's Ex-Commander Jumpsuit - RawrTaicho
+/obj/item/clothing/under/fluff/wyatt_1
+
+	name = "ex-commander jumpsuit"
+	desc = "A standard Central Command Engineering Commander jumpsuit tailored to fight the wearer tightly. It has a Medal of Service pinned onto the left side of it."
+	icon = 'custom_items.dmi'
+	icon_state = "wyatt_uniform"
+	item_state = "wyatt_uniform"
+	color = "wyatt_uniform"
+
 //////////// Masks ////////////
 
 /*

config/custom_items.txt

@@ -22,7 +22,9 @@ furlucis: Chal Appara: /obj/item/clothing/gloves/fluff/chal_appara_1
 gvazdas: Sarah Carbrokes: /obj/item/fluff/sarah_carbrokes_1
 jamini: Edwin Atweeke: /obj/item/clothing/suit/labcoat/fluff/burnt
 jamini: Nasir Khayyam: /obj/item/clothing/tie/fluff/nasir_khayyam_1
+jadepython: Thysse Ezinwa: /obj/item/clothing/glasses/eyepatch/fluff/thysse_1
 kirbyelder: John McKeever: /obj/item/paper/fluff/john_mckeever_1
+leon_the_killer: johnathan Falcian: /obj/item/weapon/clipboard/notebook/fluff/johnathan_falcian_1
 leonheart11:  Johann Erzatz: /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/johann_erzatz_1
 lexusjjss: Lexus Langg: /obj/item/weapon/clipboard/fluff/smallnote, /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/shinyflask
 lexusjjss: Zachary Tomlinson: /obj/item/weapon/clipboard/fluff/smallnote, /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/shinyflask
@@ -30,6 +32,7 @@ madmalicemccrea: Alice McCrea: /obj/item/clothing/head/welding/fluff/alice_mccre
 mangled: Li Matsuda: /obj/item/weapon/lighter/zippo/fluff/li_matsuda_1
 maximumbob: Maurice Bedford: /obj/item/fluff/maurice_bedford_1
 mcgulliver: Wox Derax: /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/lithiumflask
+mindphyre: Arjun Chopra: /obj/item/clothing/glasses/fluff/arjun_chopra_1
 misterbook: Smoke Perkins: /obj/item/clothing/mask/cigarette/pipe
 misterfox: Rashid Siraj: /obj/item/weapon/storage/bible/tajaran
 morrinn: Maye Day: /obj/item/weapon/storage/fluff/maye_daye_1
@@ -42,6 +45,7 @@ orangebottle: Lilliana Reade: /obj/item/weapon/pen/fluff/fancypen
 paththegreat: Eli Stevens: /obj/item/weapon/pen/fluff/fountainpen
 phaux: Tian Krieger: /obj/item/clothing/under/fluff/tian_dress
 rawrtaicho: Riley Rohtin: /obj/item/weapon/lighter/zippo/fluff/riley_rohtin_1
+rawrtaicho: Wyatt Engstrom: /obj/item/clothing/under/fluff/wyatt_1
 roaper: Ian Colm: /obj/item/weapon/card/id/fluff/ian_colm_1
 roaper: Ian Colm: /obj/item/clothing/glasses/welding/fluff/ian_colm_2
 rukral: Nashida Bisha'ra: /obj/item/weapon/reagent_containers/glass/beaker/large/fluff/nashida_bishara_1
@@ -66,4 +70,4 @@ tzefa: Wes Solari: /obj/item/fluff/wes_solari_1
 vinceluk: Seth Sealis: /obj/item/clothing/suit/det_suit/fluff/graycoat
 whitellama: Ethan Way: /obj/item/fluff/ethan_way_1
 whitewolf41: Jeremy Wolf: /obj/item/clothing/under/rank/security/fluff/jeremy_wolf_1
-zuhayr: Jane Doe: /obj/item/clothing/under/fluff/jane_sidsuit
+zuhayr: Jane Doe: /obj/item/clothing/under/fluff/jane_sidsuit