diff --git a/code/modules/vending/vending.dm b/code/modules/vending/vending.dm index 387c3994..75f65e4f 100644 --- a/code/modules/vending/vending.dm +++ b/code/modules/vending/vending.dm @@ -1170,6 +1170,14 @@ product_list += new/datum/data/vending_product(/obj/item/clothing/under/rank/bartender/tuxedo, 1, cost=80, hidden=1) product_list += new/datum/data/vending_product(/obj/item/clothing/shoes/dress_shoes, 1, cost=130, hidden=1) product_list += new/datum/data/vending_product(/obj/item/clothing/gloves/ring/gold, 2, cost=200, hidden=1) + product_list += new/datum/data/vending_product(/obj/item/clothing/head/cwhat, 1, cost=100, hidden=1) + product_list += new/datum/data/vending_product(/obj/item/clothing/head/fthat, 1, cost=100, hidden=1) + product_list += new/datum/data/vending_product(/obj/item/clothing/under/misc/cwfashion, 1, cost=100, hidden=1) + product_list += new/datum/data/vending_product(/obj/item/clothing/under/misc/ftuniform, 1, cost=100, hidden=1) + product_list += new/datum/data/vending_product(/obj/item/clothing/glasses/ftscanplate, 1, cost=100, hidden=1) + product_list += new/datum/data/vending_product(/obj/item/clothing/gloves/handcomp, 1, cost=100, hidden=1) + product_list += new/datum/data/vending_product(/obj/item/clothing/shoes/cwboots, 1, cost=100, hidden=1) + //obj/machinery/vending / var/const diff --git a/code/obj/item/clothing/glasses.dm b/code/obj/item/clothing/glasses.dm index 6bf9c12d..be5be2a2 100644 --- a/code/obj/item/clothing/glasses.dm +++ b/code/obj/item/clothing/glasses.dm @@ -237,7 +237,7 @@ color_r = 0.92 color_g = 0.92 color_b = 1 - + setupProperties() ..() setProperty("disorient_resist_eye", 15) @@ -534,3 +534,9 @@ H.bioHolder.AddEffect("bad_eyesight") SPAWN_DBG(100) H.bioHolder.RemoveEffect("bad_eyesight") + +/obj/item/clothing/glasses/ftscanplate + name = "FTX-480 Scanner Plate" + icon_state = "ftscanplate" + item_state = "ftscanplate" + desc = "This eyewear looks incredibly advanced, as do most things that come from the Commonwealth of Free Worlds. Unfortunately, this is a non-functioning replica sold to tourists." diff --git a/code/obj/item/clothing/gloves.dm b/code/obj/item/clothing/gloves.dm index 0054bc65..8de5b17a 100644 --- a/code/obj/item/clothing/gloves.dm +++ b/code/obj/item/clothing/gloves.dm @@ -544,4 +544,11 @@ var/list/glove_IDs = new/list() //Global list of all gloves. Identical to Cogwer user.implode() if(istype(W, /obj/item/plutonium_core/hootonium_core)) - boutput(user, "The [src] reacts but the core is too big for the slots.") \ No newline at end of file + boutput(user, "The [src] reacts but the core is too big for the slots.") + +/obj/item/clothing/gloves/handcomp + desc = "This is some sort of hand-mounted computer. Or it would be if it wasn't made out of cheap plastic and leds." + name = "Compudyne 0451 Handcomp" + icon_state = "handcomp" + item_state = "handcomp" + hide_prints = 0 diff --git a/code/obj/item/clothing/hats.dm b/code/obj/item/clothing/hats.dm index d0800883..4fc38126 100644 --- a/code/obj/item/clothing/hats.dm +++ b/code/obj/item/clothing/hats.dm @@ -1059,4 +1059,16 @@ name = "birthday hat" icon_state = "birthday-blue" item_state = "birthday-blue" - desc = "Happy birthday to you, happy birthday to you, in 200 years nobody will remember you." \ No newline at end of file + desc = "Happy birthday to you, happy birthday to you, in 200 years nobody will remember you." + +/obj/item/clothing/head/cwhat + name = "Moebius-brand headwear" + desc = "This hat looks patently ridiculous. Is this what passes for fashionable in the Commonwealth of Free Worlds?" + icon_state = "cwhat" + item_state = "cwhat" + +/obj/item/clothing/head/fthat + name = "trader's headwear" + desc = "Why in the name of space would anyone trade with someone who wears a hat that looks this dumb? Yuck." + icon_state = "fthat" + item_state = "fthat" \ No newline at end of file diff --git a/code/obj/item/clothing/shoes.dm b/code/obj/item/clothing/shoes.dm index 8021d64d..b7daa5c3 100644 --- a/code/obj/item/clothing/shoes.dm +++ b/code/obj/item/clothing/shoes.dm @@ -483,4 +483,9 @@ /obj/item/clothing/shoes/jester name = "jester's shoes" desc = "The shoes of a not-so-funny-clown." - icon_state = "jester" \ No newline at end of file + icon_state = "jester" + +/obj/item/clothing/shoes/cwboots + name = "Macando boots" + desc = "These imported boots from the Commonwealth of Free Worlds are incredibly comfy." + icon_state = "cwboots" \ No newline at end of file diff --git a/code/obj/item/clothing/uniforms.dm b/code/obj/item/clothing/uniforms.dm index 12ffd5af..2e8c43f0 100644 --- a/code/obj/item/clothing/uniforms.dm +++ b/code/obj/item/clothing/uniforms.dm @@ -1307,4 +1307,16 @@ name = "jester's outfit" desc = "Outfit of a not-so-funny-clown." icon_state = "jester" - item_state = "jester" \ No newline at end of file + item_state = "jester" + +/obj/item/clothing/under/misc/cwfashion + name = "Commonwealth fashionista's outfit" + desc = "An incredibly garish outfit that is in vogue in a far-off, independently governed sector." + icon_state = "cwfashion" + item_state = "cwfashion" + +/obj/item/clothing/under/misc/ftuniform + name = "free trader's outfit" + desc = "An orange-scarfed jumpsuit with a single sleeve missing, worn by independent traders operating beyond NT space." + icon_state = "ftuniform" + item_state = "ftuniform" \ No newline at end of file diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index de073b7a..327d41cf 100644 Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi index c50ab31c..ed819258 100644 Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi index 38d2ea47..a77c43ab 100644 Binary files a/icons/mob/hands.dmi and b/icons/mob/hands.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index bff0243f..71ee3901 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/jumpsuits/worn_js_misc.dmi b/icons/mob/jumpsuits/worn_js_misc.dmi index 778d2e50..eb6a50d3 100644 Binary files a/icons/mob/jumpsuits/worn_js_misc.dmi and b/icons/mob/jumpsuits/worn_js_misc.dmi differ diff --git a/icons/obj/clothing/item_glasses.dmi b/icons/obj/clothing/item_glasses.dmi index 98e164d9..9e6b3deb 100644 Binary files a/icons/obj/clothing/item_glasses.dmi and b/icons/obj/clothing/item_glasses.dmi differ diff --git a/icons/obj/clothing/item_gloves.dmi b/icons/obj/clothing/item_gloves.dmi index 019955e7..3b04e939 100644 Binary files a/icons/obj/clothing/item_gloves.dmi and b/icons/obj/clothing/item_gloves.dmi differ diff --git a/icons/obj/clothing/item_hats.dmi b/icons/obj/clothing/item_hats.dmi index edd47d31..104bfe69 100644 Binary files a/icons/obj/clothing/item_hats.dmi and b/icons/obj/clothing/item_hats.dmi differ diff --git a/icons/obj/clothing/item_shoes.dmi b/icons/obj/clothing/item_shoes.dmi index c92add49..be4bfc9d 100644 Binary files a/icons/obj/clothing/item_shoes.dmi and b/icons/obj/clothing/item_shoes.dmi differ diff --git a/icons/obj/clothing/uniforms/item_js_misc.dmi b/icons/obj/clothing/uniforms/item_js_misc.dmi index 1c51bee2..496d4929 100644 Binary files a/icons/obj/clothing/uniforms/item_js_misc.dmi and b/icons/obj/clothing/uniforms/item_js_misc.dmi differ