From 46fd4a8ef292f250f287dbff98e8d0d1e87dfce1 Mon Sep 17 00:00:00 2001 From: Schnayy Date: Sun, 28 Jan 2018 16:25:53 -0600 Subject: [PATCH 1/2] Adds teshari sprite for flower dress. https://gyazo.com/5da3f9159442c9059c4eb552403a7b58 https://gyazo.com/5eb1b8844c93c06cd93749777fc338c7 --- code/modules/clothing/under/miscellaneous.dm | 3 +++ icons/mob/species/seromi/uniform.dmi | Bin 44225 -> 44739 bytes 2 files changed, 3 insertions(+) diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index b9a462dabb0..b088def80c8 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -388,6 +388,9 @@ name = "flower dress" desc = "A beautiful dress with a skirt of flowers." icon_state = "flower_dress" + sprite_sheets = list( + "Teshari" = 'icons/mob/species/seromi/uniform.dmi' + ) /obj/item/clothing/under/dress/red_swept_dress name = "red swept dress" diff --git a/icons/mob/species/seromi/uniform.dmi b/icons/mob/species/seromi/uniform.dmi index 3dd7efe4a556c9cd77f47ca4b74b6e7ea1c46bc1..53a15f94f425b0292b170b7d616cd9b83e1a109b 100644 GIT binary patch delta 4707 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 delta 4189 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 Date: Tue, 30 Jan 2018 10:27:42 -0600 Subject: [PATCH 2/2] Removed unnecessary code. Thanks, Cerebul, you nerd. --- code/modules/clothing/under/miscellaneous.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index b088def80c8..b9a462dabb0 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -388,9 +388,6 @@ name = "flower dress" desc = "A beautiful dress with a skirt of flowers." icon_state = "flower_dress" - sprite_sheets = list( - "Teshari" = 'icons/mob/species/seromi/uniform.dmi' - ) /obj/item/clothing/under/dress/red_swept_dress name = "red swept dress"