From 897e6c8382d99ca75a2397b981e74fc864ece459 Mon Sep 17 00:00:00 2001 From: SinTwo Date: Mon, 7 Dec 2015 22:49:32 -0500 Subject: [PATCH] Fixes some clothes. --- code/modules/client/preferences_gear.dm | 2 +- code/modules/clothing/spacesuits/spacesuits.dm | 3 +-- code/modules/clothing/spacesuits/syndi.dm | 2 +- code/modules/clothing/spacesuits/void/void.dm | 2 +- code/modules/clothing/suits/miscellaneous.dm | 17 ++++------------- 5 files changed, 8 insertions(+), 18 deletions(-) diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index a609e38a197..3a2c8e3fa62 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -1015,7 +1015,7 @@ var/global/list/gear_datums = list() /datum/gear/leather_coat display_name = "leather coat" - path = /obj/item/clothing/suit/leathercoat/alt + path = /obj/item/clothing/suit/leathercoat cost = 2 slot = slot_wear_suit diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm index a5348767b8d..0e4d122bd22 100644 --- a/code/modules/clothing/spacesuits/spacesuits.dm +++ b/code/modules/clothing/spacesuits/spacesuits.dm @@ -7,14 +7,13 @@ icon_state = "space" desc = "A special helmet designed for work in a hazardous, low-pressure environment." item_flags = STOPPRESSUREDAMAGE | THICKMATERIAL | AIRTIGHT - flags_inv = BLOCKHAIR item_state_slots = list( slot_l_hand_str = "s_helmet", slot_r_hand_str = "s_helmet", ) permeability_coefficient = 0.01 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50) - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR body_parts_covered = HEAD|FACE|EYES cold_protection = HEAD min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm index dd6af1597ee..9922483f2cf 100644 --- a/code/modules/clothing/spacesuits/syndi.dm +++ b/code/modules/clothing/spacesuits/syndi.dm @@ -122,7 +122,7 @@ name = "black medical space helmet" desc = "A black helmet sporting a medical cross and durable plating. Hopefully the wearer abides by space geneva." icon_state = "syndicate-helm-black-med" - item_state_slots = list(slot_head_str = "syndicate-black-med") + item_state_slots = list(slot_head_str = "syndicate-helm-black-med") /obj/item/clothing/suit/space/syndicate/black/med name = "black medical space suit" diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm index 313f206948f..a6a20de09d4 100644 --- a/code/modules/clothing/spacesuits/void/void.dm +++ b/code/modules/clothing/spacesuits/void/void.dm @@ -8,7 +8,7 @@ armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 20) max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE - flags_inv = HIDEEARS | BLOCKHAIR +// flags_inv = HIDEEARS|BLOCKHAIR //Species-specific stuff. species_restricted = list("Human") diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 4d1948baddd..f8373370734 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -212,18 +212,12 @@ //coats /obj/item/clothing/suit/leathercoat - name = "leather coat" - desc = "A long, thick black leather coat." - icon_state = "leathercoat" - item_state = "leathercoat" - -/obj/item/clothing/suit/leathercoat/alt name = "leather coat" desc = "A long, thick black leather coat." icon_state = "leathercoat_alt" item_state = "leathercoat_alt" -/obj/item/clothing/suit/leathercoat/alt/sec +/obj/item/clothing/suit/leathercoat/sec name = "leather coat" desc = "A long, thick black leather coat." icon_state = "leathercoat_sec" @@ -397,11 +391,8 @@ body_parts_covered = UPPER_TORSO|ARMS /obj/item/clothing/suit/storage/leather_jacket/alt - name = "leather jacket" - desc = "A black leather coat." - icon_state = "leather_jacket_alt" - item_state = "leather_jacket_alt" - body_parts_covered = UPPER_TORSO|ARMS + icon_state = "leatherjacket_alt" + item_state = "leatherjacket_alt" /obj/item/clothing/suit/storage/leather_jacket/nanotrasen desc = "A black leather coat. A corporate logo is proudly displayed on the back." @@ -409,7 +400,7 @@ //This one has buttons for some reason /obj/item/clothing/suit/storage/toggle/brown_jacket - name = "leather jacket" + name = "brown jacket" desc = "A brown leather coat." icon_state = "brown_jacket" item_state = "brown_jacket"