diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index e8529bffd0..00e7936e89 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -151,4 +151,48 @@ desc = "Gentleman, elite aboard!" icon_state = "bowler" item_state = "bowler" - flags = FPRINT | TABLEPASS \ No newline at end of file + flags = FPRINT | TABLEPASS + +//stylish new hats + +/obj/item/clothing/head/bowlerhat + name = "bowler hat" + icon_state = "bowler_hat" + item_state = "bowler_hat" + desc = "For the gentleman of distinction." + flags = FPRINT|TABLEPASS + +/obj/item/clothing/head/beaverhat + name = "beaver hat" + icon_state = "beaver_hat" + item_state = "beaver_hat" + desc = "Soft felt makes this hat both comfortable and elegant." + flags = FPRINT|TABLEPASS + +/obj/item/clothing/head/boaterhat + name = "boater hat" + icon_state = "boater_hat" + item_state = "boater_hat" + desc = "The ultimate in summer fashion." + flags = FPRINT|TABLEPASS + +/obj/item/clothing/head/fedora + name = "\improper fedora" + icon_state = "fedora" + item_state = "fedora" + desc = "A sharp, stylish hat." + flags = FPRINT|TABLEPASS + +/obj/item/clothing/head/feathertrilby + name = "\improper feather trilby" + icon_state = "feather_trilby" + item_state = "feather_trilby" + desc = "A sharp, stylish hat with a feather." + flags = FPRINT|TABLEPASS + +/obj/item/clothing/head/fez + name = "\improper fez" + icon_state = "fez" + item_state = "fez" + desc = "You should wear a fez. Fezzes are cool." + flags = FPRINT|TABLEPASS diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index d8d1593524..4734212b98 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -37,4 +37,42 @@ /obj/item/clothing/mask/owl_mask name = "owl mask" desc = "Twoooo!" - icon_state = "owl" \ No newline at end of file + icon_state = "owl" + +//scarves (fit in in mask slot) + +/obj/item/clothing/mask/bluescarf + name = "blue neck scarf" + desc = "A blue neck scarf." + icon_state = "blueneckscarf" + item_state = "blueneckscarf" + flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH + w_class = 2 + gas_transfer_coefficient = 0.90 + +/obj/item/clothing/mask/redscarf + name = "red scarf" + desc = "A red and white checkered neck scarf." + icon_state = "redwhite_scarf" + item_state = "redwhite_scarf" + flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH + w_class = 2 + gas_transfer_coefficient = 0.90 + +/obj/item/clothing/mask/greenscarf + name = "green scarf" + desc = "A green neck scarf." + icon_state = "green_scarf" + item_state = "green_scarf" + flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH + w_class = 2 + gas_transfer_coefficient = 0.90 + +/obj/item/clothing/mask/ninjascarf + name = "ninja scarf" + desc = "A stealthy, dark scarf." + icon_state = "ninja_scarf" + item_state = "ninja_scarf" + flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH + w_class = 2 + gas_transfer_coefficient = 0.90 diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index d266e4ce5f..983c869cd1 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -93,4 +93,11 @@ /obj/item/clothing/shoes/cyborg name = "cyborg boots" desc = "Shoes for a cyborg costume" - icon_state = "boots" \ No newline at end of file + icon_state = "boots" + +/obj/item/clothing/shoes/laceups + name = "laceup shoes" + desc = "Stylish black leather." + icon_state = "laceups" + item_state = "laceups" + color = "black" diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index ecf12943e4..b7dfd1f4d4 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -208,4 +208,79 @@ else usr << "You button-up some imaginary buttons on your [src]." return - usr.update_inv_wear_suit() \ No newline at end of file + usr.update_inv_wear_suit() + +//pyjamas +//originally intended to be pinstripes >.> + +/obj/item/clothing/under/bluepyjamas + name = "blue pyjamas" + desc = "Slightly old-fashioned sleepwear." + icon_state = "blue_pyjamas" + item_state = "blue_pyjamas" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + +/obj/item/clothing/under/redpyjamas + name = "red pyjamas" + desc = "Slightly old-fashioned sleepwear." + icon_state = "red_pyjamas" + item_state = "red_pyjamas" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + +//coats + +/obj/item/clothing/suit/leathercoat + name = "leather coat" + desc = "A long, thick black leather coat." + icon_state = "leathercoat" + item_state = "leathercoat" + flags = FPRINT | TABLEPASS + +/obj/item/clothing/suit/browncoat + name = "brown leather coat" + desc = "A long, brown leather coat." + icon_state = "browncoat" + item_state = "browncoat" + flags = FPRINT | TABLEPASS + +/obj/item/clothing/suit/neocoat + name = "black coat" + desc = "A flowing, black coat." + icon_state = "neocoat" + item_state = "neocoat" + flags = FPRINT | TABLEPASS + +//actual suits + +/obj/item/clothing/suit/creamsuit + name = "cream suit" + desc = "A cream coloured, genteel suit." + icon_state = "creamsuit" + item_state = "creamsuit" + flags = FPRINT | TABLEPASS + +//stripper + +/obj/item/clothing/under/stripper/stripper_pink + name = "pink swimsuit" + desc = "A rather skimpy pink swimsuit." + icon_state = "stripper_p_under" + color = "stripper_p" + +/obj/item/clothing/under/stripper/stripper_green + name = "green swimsuit" + desc = "A rather skimpy green swimsuit." + icon_state = "stripper_g_under" + color = "stripper_g" + +/obj/item/clothing/suit/stripper/stripper_pink + name = "pink skimpy dress" + desc = "A rather skimpy pink dress." + icon_state = "stripper_p_over" + item_state = "stripper_p" + +/obj/item/clothing/suit/stripper/stripper_green + name = "green skimpy dress" + desc = "A rather skimpy green dress." + icon_state = "stripper_g_over" + item_state = "stripper_g" \ No newline at end of file diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index ce7e1498e3..7811c965e4 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -230,4 +230,72 @@ icon_state = "gladiator" item_state = "gladiator" color = "gladiator" - body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS \ No newline at end of file + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + +// + + +//wedding stuff +/obj/item/clothing/under/wedding/bride_orange + name = "orange wedding dress" + desc = "A big and puffy orange dress." + icon_state = "bride_orange" + item_state = "creamsuit" + color = "bride_orange" + flags_inv = HIDESHOES + +/obj/item/clothing/under/wedding/suit_white + name = "white suit" + desc = "A fabulous white suit with orange shirt." + icon_state = "white_suit" + item_state = "creamsuit" + color = "white_suit" + +/obj/item/clothing/under/wedding/bridesmaid + name = "yellow dress" + desc = "A big and puffy orange dress." + icon_state = "bridesmaid" + item_state = "creamsuit" + color = "bridesmaid" + +/obj/item/clothing/under/wedding/firedress + name = "flaming hot black dress" + desc = "A small black dress with blue flames print on it." + icon_state = "dress_fire" + item_state = "creamsuit" + color = "dress_fire" + +/obj/item/clothing/under/wedding/dress_orange + name = "orange dress" + icon_state = "d_orange" + color = "d_orange" + +/obj/item/clothing/under/wedding/dress_green + name = "green dress" + icon_state = "d_green" + color = "d_green" + +/obj/item/clothing/under/wedding/dress_purple + name = "purple dress" + icon_state = "d_purple" + color = "d_purple" + +/obj/item/clothing/under/wedding/dress_red + name = "red dress" + icon_state = "d_red" + color = "d_red" + +/obj/item/clothing/under/wedding/dress_blue + name = "blue dress" + icon_state = "d_blue" + color = "d_blue" + +/obj/item/clothing/under/wedding/officer_blue + name = "blue officer dress" + icon_state = "officer_blue" + color = "officer_blue" + +/obj/item/clothing/under/wedding/dress_vampire + name = "vampire dress" + icon_state = "d_vampire" + color = "d_vampire"