Skip to content
This repository has been archived by the owner on Dec 5, 2020. It is now read-only.

Sci-Fi Clothes patch, take 2 #33

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions code/modules/vending/vending.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 7 additions & 1 deletion code/obj/item/clothing/glasses.dm
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@
color_r = 0.92
color_g = 0.92
color_b = 1

setupProperties()
..()
setProperty("disorient_resist_eye", 15)
Expand Down Expand Up @@ -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. It doesn't appear to do anything other than blink, though."
9 changes: 8 additions & 1 deletion code/obj/item/clothing/gloves.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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, "<span style=\"color:red\"><B>The [src] reacts but the core is too big for the slots.</B></span>")
boutput(user, "<span style=\"color:red\"><B>The [src] reacts but the core is too big for the slots.</B></span>")

/obj/item/clothing/gloves/handcomp
desc = "This is some sort of hand-mounted computer. Unfortunately, it doesn't respond to your inputs."
name = "Compudyne 0451 Handcomp"
icon_state = "handcomp"
item_state = "handcomp"
hide_prints = 0
14 changes: 13 additions & 1 deletion code/obj/item/clothing/hats.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
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"
7 changes: 6 additions & 1 deletion code/obj/item/clothing/shoes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
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"
14 changes: 13 additions & 1 deletion code/obj/item/clothing/uniforms.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1307,4 +1307,16 @@
name = "jester's outfit"
desc = "Outfit of a not-so-funny-clown."
icon_state = "jester"
item_state = "jester"
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"
Binary file modified icons/mob/eyes.dmi
Binary file not shown.
Binary file modified icons/mob/feet.dmi
Binary file not shown.
Binary file modified icons/mob/hands.dmi
Binary file not shown.
Binary file modified icons/mob/head.dmi
Binary file not shown.
Binary file modified icons/mob/jumpsuits/worn_js_misc.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/item_glasses.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/item_gloves.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/item_hats.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/item_shoes.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/uniforms/item_js_misc.dmi
Binary file not shown.