please no merge conflict.

This commit is contained in:
Jovan
2017-03-11 19:21:06 -05:00
parent 48caf853d5
commit 65cb35fbb2
2 changed files with 8 additions and 14 deletions
@@ -139,7 +139,7 @@
"Vox" = 'icons/mob/species/vox/helmet.dmi'
)
sprite_sheets_obj = list(
"Vox" = 'icons/obj/clothing/species/vox/hats.dmi',
"Vox" = 'icons/obj/clothing/species/vox/hats.dmi'
)
/obj/item/clothing/suit/space/eva/paramedic
@@ -151,7 +151,7 @@
"Vox" = 'icons/mob/species/vox/suit.dmi'
)
sprite_sheets_obj = list(
"Vox" = 'icons/obj/clothing/species/vox/suits.dmi',
"Vox" = 'icons/obj/clothing/species/vox/suits.dmi'
)
/obj/item/clothing/suit/space/eva