From 7d52b164a668bd071c2d9d25e32870f512688b4a Mon Sep 17 00:00:00 2001 From: Synnono Date: Sat, 10 Jun 2017 15:39:59 -0400 Subject: [PATCH] Snowflake Qipao DLC (#2659) Updates the red cheongsam to not be a stoopid recolor of the white one. Now it is a stupid recolor with a unique design. Attempts to make it show up over shoes have failed, to great sorrow. Recommend not wearing any cheongsams with jackboots. Fixes quiche and keylimepie slice nutrition so that they don't go away in one bite. --- code/modules/clothing/under/miscellaneous.dm | 2 +- .../reagent_containers/food/snacks.dm | 7 ++++--- icons/obj/clothing/cheongsams.dmi | Bin 5204 -> 5208 bytes 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index e57ea795e3e..c9e42294b85 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -534,7 +534,7 @@ /obj/item/clothing/under/cheongsam/red name = "red cheongsam" - desc = "A Chinese dress that hugs the body. This one is red, with a golden dragon design that climbs the entire garment." + desc = "A Chinese dress that hugs the body. This one is red, with a golden leaf trim that climbs up the garment." icon_state = "cheongsamred" item_state = "cheongsamred" worn_state = "cheongsamred" diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index dde6fcf2a39..5dbcc3e51f6 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -3510,7 +3510,8 @@ /obj/item/weapon/reagent_containers/food/snacks/keylimepieslice/filled/New() ..() - reagents.add_reagent("nutriment", 1) + reagents.add_reagent("nutriment", 3) + reagents.add_reagent("protein", 1) /obj/item/weapon/reagent_containers/food/snacks/sliceable/quiche name = "quiche" @@ -3539,8 +3540,8 @@ /obj/item/weapon/reagent_containers/food/snacks/quicheslice/filled/New() ..() - reagents.add_reagent("nutriment", 1) - reagents.add_reagent("protein", 1) + reagents.add_reagent("nutriment", 3) + reagents.add_reagent("protein", 3) /obj/item/weapon/reagent_containers/food/snacks/sliceable/brownies name = "brownies" diff --git a/icons/obj/clothing/cheongsams.dmi b/icons/obj/clothing/cheongsams.dmi index 75d46afe93bd32b9f41d1132167d0fcf723c9695..c6df8c23431e63915b2f4ff355b57e63e912ec65 100644 GIT binary patch delta 4515 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 delta 4492 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 GQU3!nJzTi}