From f3d037929cbd4d8f4da665e5ccf79beaea90a7da Mon Sep 17 00:00:00 2001 From: Paxilmaniac Date: Sat, 11 Jan 2020 20:49:40 -0800 Subject: [PATCH] subtypes are very cool hi x2 --- code/modules/clothing/ears/_ears.dm | 23 +++++++++-------------- code/modules/vending/clothesmate.dm | 2 +- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/code/modules/clothing/ears/_ears.dm b/code/modules/clothing/ears/_ears.dm index 0307343fea5..435c34784de 100644 --- a/code/modules/clothing/ears/_ears.dm +++ b/code/modules/clothing/ears/_ears.dm @@ -7,20 +7,6 @@ slot_flags = ITEM_SLOT_EARS resistance_flags = NONE -/obj/item/clothing/ears/spacepods - name = "nanotrasen space pods" - desc = "Flex your money, AND ignore what everone else says, all at once!" - icon = 'icons/obj/clothing/accessories.dmi' - icon_state = "spacepods" - item_state = "spacepods" - strip_delay = 100 //air pods don't fall out - custom_premium_price = 1800 - -/obj/item/clothing/ears/spacepods/ComponentInitialize() - . = ..() - AddElement(/datum/element/earhealing) - AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) - /obj/item/clothing/ears/earmuffs name = "earmuffs" desc = "Protects your hearing from loud noises, and quiet ones as well." @@ -36,6 +22,15 @@ AddElement(/datum/element/earhealing) AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) +/obj/item/clothing/ears/earmuffs/spacepods + name = "nanotrasen space pods" + desc = "Flex your money, AND ignore what everone else says, all at once!" + icon = 'icons/obj/clothing/accessories.dmi' + icon_state = "spacepods" + item_state = "spacepods" + strip_delay = 100 //air pods don't fall out + custom_premium_price = 1800 + /obj/item/clothing/ears/headphones name = "headphones" desc = "Unce unce unce unce. Boop!" diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index e58d09be766..45867d5ec02 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -127,7 +127,7 @@ /obj/item/clothing/under/pants/mustangjeans = 1, /obj/item/clothing/neck/necklace/dope = 3, /obj/item/clothing/suit/jacket/letterman_nanotrasen = 1, - /obj/item/clothing/ears/spacepods = 1) + /obj/item/clothing/ears/earmuffs/spacepods = 1) refill_canister = /obj/item/vending_refill/clothing default_price = 60 extra_price = 120