From 2d2e1acf6aa6f57ac06db6e34fa1b8a4ac19de5e Mon Sep 17 00:00:00 2001 From: CosmicScientist Date: Tue, 28 Jul 2015 20:19:26 +0100 Subject: [PATCH] Ian costume is now Corgi costume, made from corgi hide, can be put on a corgi to visually hide if they're shaved, get corgi hide from butchering corgis, furismurder --- .../objects/items/stacks/sheets/leather.dm | 8 ++++++++ code/modules/clothing/suits/miscellaneous.dm | 10 +++++----- .../mob/living/simple_animal/friendly/dog.dm | 3 ++- icons/mob/corgi_back.dmi | Bin 4999 -> 5853 bytes 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index 63e9d3b2f72..e14aa1d859f 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -12,6 +12,14 @@ icon_state = "sheet-corgi" origin_tech = null +var/global/list/datum/stack_recipe/corgi_recipes = list ( \ + new/datum/stack_recipe("corgi costume", /obj/item/clothing/suit/hooded/ian_costume, 3, on_floor = 1), \ + ) + +/obj/item/stack/sheet/animalhide/corgi/New(var/loc, var/amount=null) + recipes = corgi_recipes + return ..() + /obj/item/stack/sheet/animalhide/cat name = "cat hide" desc = "The by-product of cat farming." diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index f53522be851..8c570131a3f 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -220,21 +220,21 @@ flags = NODROP /obj/item/clothing/suit/hooded/ian_costume //It's Ian, rub his bell- oh god what happened to his inside parts? - name = "ian costume" - desc = "A costume that looks like someone made Ian human, it won't guarantee belly rubs." + name = "corgi costume" + desc = "A costume that looks like someone made a human-like corgi, it won't guarantee belly rubs." icon_state = "ian" item_state = "labcoat" body_parts_covered = CHEST|GROIN|ARMS //cold_protection = CHEST|GROIN|ARMS - //min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT //Uncomment if Ian's body warms you at night + //min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT allowed = list(,) hooded = 1 action_button_name = "Toggle Ian Hood" hoodtype = /obj/item/clothing/head/ian_hood /obj/item/clothing/head/ian_hood - name = "ian hood" - desc = "A hood that looks just like Ian's head, it won't guarantee dog biscuits." + name = "corgi hood" + desc = "A hood that looks just like a corgi's head, it won't guarantee dog biscuits." icon_state = "ian" body_parts_covered = HEAD //cold_protection = HEAD diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm index 61744de3e29..36fa3134f1c 100644 --- a/code/modules/mob/living/simple_animal/friendly/dog.dm +++ b/code/modules/mob/living/simple_animal/friendly/dog.dm @@ -22,7 +22,7 @@ icon_living = "corgi" icon_dead = "corgi_dead" gender = MALE - butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab/corgi = 3) + butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab/corgi = 3, /obj/item/stack/sheet/animalhide/corgi = 1) childtype = /mob/living/simple_animal/pet/dog/corgi/puppy species = /mob/living/simple_animal/pet/dog var/shaved = 0 @@ -181,6 +181,7 @@ /obj/item/weapon/tank/internals/oxygen, /obj/item/weapon/tank/internals/air, /obj/item/weapon/extinguisher, + /obj/item/clothing/suit/hooded/ian_costume, ) if( ! ( item_to_add.type in allowed_types ) ) diff --git a/icons/mob/corgi_back.dmi b/icons/mob/corgi_back.dmi index 657a7c01a542b4aed38ba88da40b04409d54b1bb..616d8ab2061609ff511202ad2721868341050664 100644 GIT binary patch delta 5527 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 XHL+q=Hk$y#^Xi3`as{!XRrvn^*yG=o literal 4999 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 QZ`ObZ>iTLG_w2&|190DUTmS$7