diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 0a98c263a6..afa4d3dde3 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -229,6 +229,7 @@ SPECIES_TESHARI = 'icons/mob/species/seromi/gloves.dmi', SPECIES_VOX = 'icons/mob/species/vox/gloves.dmi' ) + drop_sound = 'sound/items/drop/gloves.ogg' /obj/item/clothing/proc/set_clothing_index() return @@ -362,6 +363,7 @@ SPECIES_TESHARI = 'icons/mob/species/seromi/head.dmi', SPECIES_VOX = 'icons/mob/species/vox/head.dmi' ) + drop_sound = 'sound/items/drop/hat.ogg' /obj/item/clothing/head/attack_self(mob/user) if(brightness_on) @@ -517,6 +519,7 @@ SPECIES_TESHARI = 'icons/mob/species/seromi/shoes.dmi', SPECIES_VOX = 'icons/mob/species/vox/shoes.dmi' ) + drop_sound = 'sound/items/drop/shoes.ogg' /obj/item/clothing/shoes/proc/draw_knife() set name = "Draw Boot Knife" diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index e787bbd893..1c5ad9c05c 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -1,9 +1,4 @@ -/obj/item/clothing/gloves - desc = "you aren't supposed to see this." - name = "strange gloves" - icon_state = "black" - item_state = "bgloves" - drop_sound = 'sound/items/drop/gloves.ogg' + /obj/item/clothing/gloves/yellow desc = "These gloves will protect the wearer from electric shock." diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index dafce7ad6b..810ac403f7 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -1,11 +1,6 @@ //Hat Station 13 -/obj/item/clothing/head/ - name = "hat" - desc = "Apply on head." - drop_sound = 'sound/items/drop/hat.ogg' - /obj/item/clothing/head/collectable name = "collectable hat" desc = "A rare collectable hat." diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 00fccfea19..eab03a3c2e 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -169,7 +169,7 @@ body_parts_covered = HEAD|FACE|EYES w_class = ITEMSIZE_SMALL siemens_coefficient = 0.9 - + /obj/item/clothing/mask/nock_scarab name = "nock mask (blue, scarab)" desc = "To Nock followers, masks symbolize rebirth and a new persona. Damaging the wearer's mask is generally considered an attack on their person itself." diff --git a/code/modules/clothing/rings/rings.dm b/code/modules/clothing/rings/rings.dm index c04c757d9d..b8313c5f97 100644 --- a/code/modules/clothing/rings/rings.dm +++ b/code/modules/clothing/rings/rings.dm @@ -1,6 +1,6 @@ //Generic Ring -/obj/item/clothing/ring +/obj/item/clothing/gloves/ring name = "generic ring" desc = "Torus shaped finger decoration." icon_state = "material" diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm index c1f970224e..8f72b24163 100644 --- a/code/modules/clothing/shoes/colour.dm +++ b/code/modules/clothing/shoes/colour.dm @@ -1,8 +1,3 @@ -/obj/item/clothing/shoes - name = "shoes" - icon_state = "white" - desc = "A pair of shoes." - drop_sound = 'sound/items/drop/shoes.ogg' /obj/item/clothing/shoes/black name = "black shoes" diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index d7760bcfd9..ac96bf893b 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/species/tajaran/mask.dmi b/icons/mob/species/tajaran/mask.dmi index 71a5c85389..6902130e1d 100644 Binary files a/icons/mob/species/tajaran/mask.dmi and b/icons/mob/species/tajaran/mask.dmi differ