diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 5134f48b3f..6e6acf08bd 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -180,6 +180,31 @@ path = /obj/item/clothing/suit/wcoat cost = 1 +/datum/gear/suit/wcoat/red + display_name = "red waistcoat" + path = /obj/item/clothing/suit/wcoat/red + +/datum/gear/suit/wcoat/grey + display_name = "grey waistcoat" + path = /obj/item/clothing/suit/wcoat/grey + +/datum/gear/suit/wcoat/brown + display_name = "brown waistcoat" + path = /obj/item/clothing/suit/wcoat/brown + +/datum/gear/suit/swvest + display_name = "black sweatervest" + path = /obj/item/clothing/suit/wcoat/swvest + cost = 1 + +/datum/gear/suit/swvest/blue + display_name = "blue sweatervest" + path = /obj/item/clothing/suit/wcoat/swvest/blue + +/datum/gear/suit/swvest/red + display_name = "red sweatervest" + path = /obj/item/clothing/suit/wcoat/swvest/red + /datum/gear/suit/forensics display_name = "forensics long, red" path = /obj/item/clothing/suit/storage/forensics/red/long diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 09cc0356ad..d57ebe40ff 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -5,6 +5,11 @@ siemens_coefficient = 0.9 body_parts_covered = 0 +/obj/item/clothing/head/centhat/customs + name = "Customs Hat" + desc = "A formal hat for SolGov Customs Officers." + icon_state = "customshat" + /obj/item/clothing/head/hairflower name = "hair flower pin" icon_state = "hairflower" @@ -79,7 +84,7 @@ /obj/item/clothing/head/syndicatefake name = "red space-helmet replica" - item_state_slots = list(slot_r_hand_str = "syndicate-helm-black-red", slot_l_hand_str = "syndicate-helm-black-red") + item_state_slots = list(slot_r_hand_str = "syndicate-helm-black-red", slot_l_hand_str = "syndicate-helm-black-red") icon_state = "syndicate" desc = "A plastic replica of a bloodthirsty mercenary's space helmet, you'll look just like a real murderous criminal operative in this! This is a toy, it is not made for use in space!" flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR @@ -125,7 +130,7 @@ /obj/item/clothing/head/justice/pink icon_state = "justicepink" - + /obj/item/clothing/head/rabbitears name = "rabbit ears" desc = "Wearing these makes you looks useless, and only good for your sex appeal." @@ -202,7 +207,7 @@ name = "fez" icon_state = "fez" desc = "You should wear a fez. Fezzes are cool." - + /obj/item/clothing/head/cowboy_hat name = "cowboy hat" desc = "For those that have spurs that go jingle jangle jingle." diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index c93bb20760..51ec3c6edd 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -55,7 +55,7 @@ flags = CONDUCT fire_resist = T0C+5200 flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT - + /obj/item/clothing/suit/greatcoat name = "great coat" desc = "A heavy great coat" @@ -92,6 +92,31 @@ blood_overlay_type = "armor" body_parts_covered = UPPER_TORSO|LOWER_TORSO +/obj/item/clothing/suit/wcoat/red + name = "red waistcoat" + icon_state = "red_waistcoat" + +/obj/item/clothing/suit/wcoat/grey + name = "grey waistcoat" + icon_state = "grey_waistcoat" + +/obj/item/clothing/suit/wcoat/brown + name = "brown waistcoat" + icon_state = "brown_waistcoat" + +/obj/item/clothing/suit/wcoat/swvest + name = "black sweatervest" + desc = "A sleeveless sweater. Wear this if you don't want your arms to be warm, or if you're a nerd." + icon_state = "sweatervest" + +/obj/item/clothing/suit/wcoat/swvest/blue + name = "blue sweatervest" + icon_state = "sweatervest_blue" + +/obj/item/clothing/suit/wcoat/swvest/red + name = "red sweatervest" + icon_state = "sweatervest_red" + /obj/item/clothing/suit/apron/overalls name = "coveralls" desc = "A set of denim overalls." @@ -197,7 +222,13 @@ desc = "A flowing, black coat." icon_state = "neocoat" item_state_slots = list(slot_r_hand_str = "leather_jacket", slot_l_hand_str = "leather_jacket") - + +/obj/item/clothing/suit/customs + name = "customs jacket" + desc = "A standard SolGov Customs formal jacket." + icon_state = "customs_jacket" + item_state_slots = list(slot_r_hand_str = "suit_blue", slot_l_hand_str = "suit_blue") + /* * stripper */ @@ -732,4 +763,4 @@ icon_open = "suitjacket_green_open" icon_closed = "suitjacket_green" blood_overlay_type = "coat" - body_parts_covered = UPPER_TORSO|ARMS + body_parts_covered = UPPER_TORSO|ARMS diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index e3c1d6b45d..dc4085ddde 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -33,6 +33,14 @@ icon_state = "waiter" rolled_sleeves = 0 +/obj/item/clothing/under/customs + name = "customs uniform" + desc = "A standard SolGov customs uniform. Complete with epaulettes." + icon_state = "cu_suit" + +/obj/item/clothing/under/customs/khaki + icon_state = "cu_suit_kh" + /obj/item/clothing/under/rank/mailman name = "mailman's jumpsuit" desc = "'Special delivery!'" @@ -253,7 +261,7 @@ /obj/item/clothing/under/dress/stripeddress name = "striped dress" desc = "Fashion in space." - icon_state = "striped_dress" + icon_state = "striped_dress" /obj/item/clothing/under/dress/sailordress name = "sailor dress" @@ -529,7 +537,7 @@ name = "fancy dark red dress" desc = "A short, red dress with a black belt. Fancy." icon_state = "darkreddress" - + /* * swimsuit */ @@ -566,7 +574,7 @@ desc = "An oldfashioned red swimsuit." icon_state = "swim_red" siemens_coefficient = 1 - + /* * pyjamas */ @@ -583,7 +591,7 @@ icon_state = "red_pyjamas" item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red") body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS - + /obj/item/clothing/under/stripper body_parts_covered = 0 @@ -598,7 +606,7 @@ desc = "A rather skimpy green swimsuit." icon_state = "stripper_g_under" siemens_coefficient = 1 - + /obj/item/clothing/under/stripper/mankini name = "mankini" desc = "No honest man would wear this abomination" diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index f26dd77bf4..4ab57826c1 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 554cad55b4..598e51c860 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 6f3bd865e6..17fe5b8ad9 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index d0c44e3fd1..f098e49ce6 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 2fe02d970e..954b5996c9 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index a1725f7f8a..235d0b5193 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ