diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 8f8053bb318..6ee0502c886 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -385,15 +385,6 @@ icon_state = "ian_colm_1" //////////// Hats //////////// -//Removed by request -/* -/obj/item/clothing/head/helmet/hardhat/fluff/greg_anderson_1 //deusdactyl: Greg Anderson - name = "old hard hat" - desc = "An old dented hard hat with the nametag \"Anderson\". It seems to be backwards." - icon_state = "hardhat0_dblue" //Already an in-game sprite - item_state = "hardhat0_dblue" - color = "dblue" -*/ /obj/item/clothing/head/secsoft/fluff/swatcap //deusdactyl: James Girard name = "\improper SWAT hat" @@ -533,25 +524,31 @@ //////////// Shoes //////////// -/*/obj/item/clothing/shoes/fluff/leatherboots //serithi: Serithi Artalis - name = "leather boots" - desc = "A pair of leather boots. Well-worn, but still kept in good condition. There is a small \"S\" scratched into the back of each boot." +/obj/item/clothing/shoes/magboots/fluff/susan_harris_1 //sniperyeti: Susan Harris + name = "Susan's Magboots" + desc = "A colorful pair of magboots with the name Susan Harris clearly written on the back." icon = 'custom_items.dmi' - icon_state = "leatherboots" - item_state = "jackboots" -*/ + icon_state = "atmosmagboots0" + verb/toggle() + set name = "Toggle Magboots" + set category = "Object" + set src in usr + if(src.magpulse) + src.flags &= ~NOSLIP + src.slowdown = SHOES_SLOWDOWN + src.magpulse = 0 + icon_state = "atmosmagboots0" + usr << "You disable the mag-pulse traction system." + else + src.flags |= NOSLIP + src.slowdown = 2 + src.magpulse = 1 + icon_state = "atmosmagboots1" + usr << "You enable the mag-pulse traction system." + //////////// Sets //////////// -////// CDC //deusdactyl: Roger Wiles -//Removed by request. /* -/obj/item/clothing/under/rank/virologist/fluff/cdc_jumpsuit - name = "\improper CDC jumpsuit" - desc = "A modified standard-issue CDC jumpsuit made of a special fiber that gives special protection against biohazards. It has a biohazard symbol sewn into the back." - icon = 'custom_items.dmi' - icon_state = "cdc_jumpsuit" - color = "cdc_jumpsuit" - /obj/item/clothing/suit/labcoat/fluff/cdc_labcoat name = "\improper CDC labcoat" desc = "A standard-issue CDC labcoat that protects against minor chemical spills. It has the name \"Wiles\" sewn on to the breast pocket." diff --git a/config/custom_items.txt b/config/custom_items.txt index bda1cf5ada6..e2203141e65 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -29,6 +29,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 +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 naples: Russell Vierson: /obj/item/weapon/lighter/zippo/fluff/naples_1 @@ -47,6 +48,7 @@ searif: Ara Al-Jazari: /obj/item/clothing/under/rank/bartender/fluff/classy sirribbit: /obj/item/weapon/clipboard/fluff/mcreary_journal sicktrigger: David Fanning: /obj/item/fluff/david_fanning_1 silentthunder: Val McNeil: /obj/item/fluff/val_mcneil_1 +sniperyeti: Susan Harris: /obj/item/clothing/shoes/magboots/fluff/susan_harris_1 spaceman96: Trenna Seber: /obj/item/weapon/pen/fluff/multi, /obj/item/clothing/suit/labcoat/fluff/pink sparklysheep: Cado Keppel: /obj/item/weapon/fluff/cado_keppel_1 sparklysheep: Uzenwa Sissra: /obj/item/clothing/glasses/fluff/uzenwa_sissra_1 diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi index b7b7b3fdf8b..e254e60ad90 100644 Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi index 9c552ae4f56..7ecb7dd33c7 100644 Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ