diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 701f0cdace..3e34179da3 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -50,6 +50,12 @@ var/global/list/gear_datums = list() cost = 2 slot = slot_head +/datum/gear/obandana + display_name = "bandana, orange" + path = /obj/item/clothing/head/orangebandana + cost = 2 + slot = slot_head + /datum/gear/bandana display_name = "bandana, pirate-red" path = /obj/item/clothing/head/bandana @@ -456,17 +462,35 @@ var/global/list/gear_datums = list() slot = slot_wear_suit /datum/gear/leather_jacket - display_name = "leather jacket" + display_name = "leather jacket, black" path = /obj/item/clothing/suit/storage/leather_jacket cost = 3 slot = slot_wear_suit -/datum/gear/leather_jacket - display_name = "leather jacket, NanoTrasen" +/datum/gear/leather_jacket_nt + display_name = "leather jacket, NanoTrasen, black" path = /obj/item/clothing/suit/storage/leather_jacket/nanotrasen cost = 3 slot = slot_wear_suit +/datum/gear/brown_jacket + display_name = "leather jacket, brown" + path = /obj/item/clothing/suit/storage/brown_jacket + cost = 3 + slot = slot_wear_suit + +/datum/gear/brown_jacket_nt + display_name = "leather jacket, NanoTrasen, brown" + path = /obj/item/clothing/suit/storage/brown_jacket/nanotrasen + cost = 3 + slot = slot_wear_suit + +/datum/gear/hoodie + display_name = "hoodie, grey" + path = /obj/item/clothing/suit/hoodie + cost = 2 + slot = slot_wear_suit + /datum/gear/unathi_mantle display_name = "hide mantle (Unathi)" path = /obj/item/clothing/suit/unathi/mantle diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 75aebd2a86..244d10c050 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -1,5 +1,6 @@ /obj/item/clothing name = "clothing" + siemens_coefficient = 0.9 var/list/species_restricted = null //Only these species can wear this kit. /* diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 4316d427c2..991d01a216 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -234,7 +234,7 @@ icon_state = "chickenhead" item_state = "chickensuit" flags = FPRINT | TABLEPASS | BLOCKHAIR - siemens_coefficient = 2.0 + siemens_coefficient = 0.7 body_parts_covered = HEAD|FACE|EYES /obj/item/clothing/head/bearpelt @@ -243,7 +243,7 @@ icon_state = "bearpelt" item_state = "bearpelt" flags = FPRINT | TABLEPASS | BLOCKHAIR - siemens_coefficient = 2.0 + siemens_coefficient = 0.7 /obj/item/clothing/head/xenos name = "xenos helmet" @@ -261,5 +261,12 @@ icon_state = "philosopher_wig" item_state = "philosopher_wig" flags = FPRINT | TABLEPASS | BLOCKHAIR - siemens_coefficient = 2.0 + siemens_coefficient = 2.0 //why is it so conductive?! body_parts_covered = 0 + +/obj/item/clothing/head/orangebandana //themij: Taryn Kifer + name = "orange bandana" + desc = "An orange piece of cloth, worn on the head." + icon_state = "orange_bandana" + item_state = "orange_bandana" + body_parts_covered = 0 diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index ed0cbad81a..68f8fd99d7 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -397,8 +397,47 @@ body_parts_covered = UPPER_TORSO|ARMS /obj/item/clothing/suit/storage/leather_jacket/nanotrasen - name = "leather jacket" desc = "A black leather coat. The letters NT are proudly displayed on the back." icon_state = "leather_jacket_nt" - item_state = "leather_jacket_nt" - body_parts_covered = UPPER_TORSO|ARMS \ No newline at end of file + +//This one has buttons for some reason +/obj/item/clothing/suit/storage/brown_jacket + name = "leather jacket" + desc = "A brown leather coat." + icon_state = "brown_jacket" + item_state = "brown_jacket" + var/open_state = "brown_jacket_open" + body_parts_covered = UPPER_TORSO|ARMS + +/obj/item/clothing/suit/storage/brown_jacket/nanotrasen + desc = "A brown leather coat. The letters NT are proudly displayed on the back." + icon_state = "brown_jacket_nt" + open_state = "brown_jacket_nt_open" + +/obj/item/clothing/suit/storage/brown_jacket/verb/toggle() + set name = "Toggle Jacket Buttons" + set category = "Object" + set src in usr + + if(!usr.canmove || usr.stat || usr.restrained()) + return 0 + + //The inhand sprite (the mob sprite that appears when holding the item in your hand) + //is unchanged, so update only icon_state, not item_state. + if(icon_state == open_state) + usr << "You button up the jacket." + src.icon_state = initial(icon_state) + + else if(icon_state == initial(icon_state)) + usr << "You unbutton the jacket." + src.icon_state = open_state + + update_clothing_icon() //so our overlays update + +/obj/item/clothing/suit/hoodie + name = "grey hoodie" + desc = "A warm, grey sweatshirt." + icon_state = "grey_hoodie" + item_state = "grey_hoodie" + min_cold_protection_temperature = T0C - 20 + cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index e80db6c26b..73d15e31ed 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -746,12 +746,9 @@ icon = 'icons/obj/custom_items.dmi' icon_state = "paintedwelding" -/obj/item/clothing/head/helmet/greenbandana/fluff/taryn_kifer_1 //themij: Taryn Kifer +/obj/item/clothing/head/orangebandana/fluff/taryn_kifer_1 //themij: Taryn Kifer name = "orange bandana" desc = "Hey, I think we're missing a hazard vest..." - icon = 'icons/obj/custom_items.dmi' - icon_state = "taryn_kifer_1" - body_parts_covered = 0 /obj/item/clothing/head/fluff body_parts_covered = 0 diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index e4ce980456..9cd620946c 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -862,7 +862,7 @@ proc/get_damage_icon_part(damage_state, body_part) /mob/living/carbon/human/update_inv_r_hand(var/update_icons=1) if(r_hand) r_hand.screen_loc = ui_rhand //TODO - var/t_state = r_hand.item_state + var/t_state = r_hand.item_state //useful for clothing that changes icon_state but retains the same sprite on the mob when held in hand if(!t_state) t_state = r_hand.icon_state if(r_hand.icon_override) @@ -880,7 +880,7 @@ proc/get_damage_icon_part(damage_state, body_part) /mob/living/carbon/human/update_inv_l_hand(var/update_icons=1) if(l_hand) l_hand.screen_loc = ui_lhand //TODO - var/t_state = l_hand.item_state + var/t_state = l_hand.item_state //useful for clothing that changes icon_state but retains the same sprite on the mob when held in hand if(!t_state) t_state = l_hand.icon_state if(l_hand.icon_override) diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 1c25214b2d..0f5c3a5604 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi index 1e499e8635..ddea2d9156 100644 Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi index 21c3ef4620..2990e374cc 100644 Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index bac90ffc0c..f88e2c764a 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index e9887aedf3..98f1ac02d4 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 c3dbb3fadd..65568e7ccf 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi index 24bcaef982..d640e6c860 100644 Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ