diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 1fd7d10230..769e9966c3 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -210,4 +210,12 @@ /datum/gear/accessory/webbing display_name = "webbing, simple" path = /obj/item/clothing/accessory/storage/webbing - cost = 2 \ No newline at end of file + cost = 2 + +/datum/gear/accessory/chaps + display_name = "chaps, brown" + path = /obj/item/clothing/accessory/chaps + +/datum/gear/accessory/chaps/black + display_name = "chaps, black" + path = /obj/item/clothing/accessory/chaps/black \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_shoes.dm b/code/modules/client/preference_setup/loadout/loadout_shoes.dm index d6e61c561e..29c6317b1f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_shoes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_shoes.dm @@ -95,4 +95,12 @@ /datum/gear/shoes/flats/white display_name = "flats, white" - path = /obj/item/clothing/shoes/flats/white \ No newline at end of file + path = /obj/item/clothing/shoes/flats/white + +/datum/gear/shoes/flipflops + display_name = "flip flops" + path = /obj/item/clothing/shoes/flipflop + +/datum/gear/shoes/flipflops/New() + ..() + gear_tweaks = list(gear_tweak_free_color_choice) \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index 80e6bb8ebf..b8ed50c23f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -121,3 +121,9 @@ display_name = "gear harness (Full Body Prosthetic, Diona)" path = /obj/item/clothing/under/harness sort_category = "Xenowear" + +/datum/gear/uniform/loincloth + display_name = "loincloth (Tajaran, Unathi)" + path = /obj/item/clothing/under/shorts/loincloth + sort_category = "Xenowear" + whitelisted = list("Tajaran", "Unathi") diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index f6423106a5..723d802186 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -199,4 +199,9 @@ cold_protection = FEET|LEGS min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE heat_protection = FEET|LEGS - max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE + max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE + +/obj/item/clothing/shoes/flipflop + name = "flip flops" + desc = "A pair of foam flip flops. For those not afraid to show a little ankle." + icon_state = "thongsandal" diff --git a/code/modules/clothing/under/accessories/clothing.dm b/code/modules/clothing/under/accessories/clothing.dm index 59b2ba1797..3ba56bdd6b 100644 --- a/code/modules/clothing/under/accessories/clothing.dm +++ b/code/modules/clothing/under/accessories/clothing.dm @@ -26,4 +26,14 @@ /obj/item/clothing/accessory/checkered_jacket name = "checkered suit jacket" desc = "Lucky suit jacket." - icon_state = "checkered_jacket" \ No newline at end of file + icon_state = "checkered_jacket" + +/obj/item/clothing/accessory/chaps + name = "brown chaps" + desc = "A pair of loose, brown leather chaps." + icon_state = "chaps" + +/obj/item/clothing/accessory/chaps/black + name = "black chaps" + desc = "A pair of loose, black leather chaps." + icon_state = "chaps_black" \ No newline at end of file diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index a444377017..e673de378c 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -225,6 +225,7 @@ desc = "Includes shoes and plaid" icon_state = "kilt" body_parts_covered = UPPER_TORSO|LOWER_TORSO|FEET + rolled_sleeves = 0 /obj/item/clothing/under/sexymime name = "sexy mime outfit" diff --git a/code/modules/clothing/under/pants.dm b/code/modules/clothing/under/pants.dm index 3cfc550e43..3c210cc0c0 100644 --- a/code/modules/clothing/under/pants.dm +++ b/code/modules/clothing/under/pants.dm @@ -82,6 +82,16 @@ desc = "A pair of woodland camouflage pants. Probably not the best choice for a space station." icon_state = "camopants" +/obj/item/clothing/under/pants/chaps + name = "sexy brown chaps" + desc = "A pair of sexy, tight brown leather chaps." + icon_state = "chapsb" + +/obj/item/clothing/under/pants/chaps/black + name = "sexy black chaps" + desc = "A pair of sexy, tight black leather chaps." + icon_state = "chapsbl" + /* * Baggy Pants */ diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm index 0690b49565..59db7aaab5 100644 --- a/code/modules/clothing/under/shorts.dm +++ b/code/modules/clothing/under/shorts.dm @@ -83,6 +83,11 @@ name = "khaki short shorts" icon_state = "khaki_shorts_f" +/obj/item/clothing/under/shorts/loincloth + name = "loincloth" + desc = "A piece of cloth wrapped around the waist." + icon_state = "loincloth" + //Argh, skirts be below this line -> ------------------------------ /obj/item/clothing/under/skirt @@ -128,50 +133,50 @@ desc = "A preppy red skirt with a white blouse." icon_state = "plaid_red" item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red") - + /obj/item/clothing/under/skirt/plaid_purple name = "blue purple skirt" desc = "A preppy purple skirt with a white blouse." icon_state = "plaid_purple" item_state_slots = list(slot_r_hand_str = "purple", slot_l_hand_str = "purple") - + /obj/item/clothing/under/rank/cargo/skirt name = "quartermaster's jumpskirt" desc = "It's a jumpskirt worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper." icon_state = "qmf" item_state_slots = list(slot_r_hand_str = "qm", slot_l_hand_str = "qm") - + /obj/item/clothing/under/rank/cargotech/skirt name = "cargo technician's jumpskirt" desc = "Skirrrrrts! They're comfy and easy to wear!" icon_state = "cargof" item_state_slots = list(slot_r_hand_str = "cargo", slot_l_hand_str = "cargo") - + /obj/item/clothing/under/rank/engineer/skirt desc = "It's an orange high visibility jumpskirt worn by engineers. It has minor radiation shielding." name = "engineer's jumpskirt" icon_state = "enginef" armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10) item_state_slots = list(slot_r_hand_str = "engine", slot_l_hand_str = "engine") - + /obj/item/clothing/under/rank/chief_engineer/skirt desc = "It's a high visibility jumpskirt given to those engineers insane enough to achieve the rank of \"Chief engineer\". It has minor radiation shielding." name = "chief engineer's jumpskirt" icon_state = "chieff" item_state_slots = list(slot_r_hand_str = "chiefengineer", slot_l_hand_str = "chiefengineer") - + /obj/item/clothing/under/rank/atmospheric_technician/skirt desc = "It's a jumpskirt worn by atmospheric technicians." name = "atmospheric technician's jumpskirt" icon_state = "atmosf" item_state_slots = list(slot_r_hand_str = "atmos", slot_l_hand_str = "atmos") - + /obj/item/clothing/under/rank/roboticist/skirt desc = "It's a slimming black jumpskirt with reinforced seams; great for industrial work." name = "roboticist's jumpskirt" icon_state = "roboticsf" item_state_slots = list(slot_r_hand_str = "robotics", slot_l_hand_str = "robotics") - + /obj/item/clothing/under/rank/scientist/skirt name = "scientist's jumpskirt" icon_state = "sciencef" diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi index afc8a68ddd..cd378680b2 100644 Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index 67898604e3..0fed686ea1 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 17fe5b8ad9..498b9e6510 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi index 8bd1183df8..3cd1a040a6 100644 Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index c97eff9aa4..e614e47e49 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 235d0b5193..0d209716d8 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ