From 82d49a4a5efd8f840d3bdf5aaa1f815ed33b6018 Mon Sep 17 00:00:00 2001 From: Azarak Date: Thu, 1 Oct 2020 22:03:44 +0200 Subject: [PATCH] fixes some clothes (#1100) --- .../modules/clothing/non_anthro_clothes.dm | 56 +++++++++++++++++++ .../modules/clothing/clothing.dm | 5 +- .../modules/clothing/head/head.dm | 2 + .../modules/clothing/under/costumes.dm | 1 - .../modules/clothing/under/misc.dm | 4 +- 5 files changed, 65 insertions(+), 3 deletions(-) diff --git a/modular_skyrat/master_files/code/modules/clothing/non_anthro_clothes.dm b/modular_skyrat/master_files/code/modules/clothing/non_anthro_clothes.dm index 0602eae4140..5e7aea4083f 100644 --- a/modular_skyrat/master_files/code/modules/clothing/non_anthro_clothes.dm +++ b/modular_skyrat/master_files/code/modules/clothing/non_anthro_clothes.dm @@ -56,17 +56,68 @@ /obj/item/clothing/head/beret mutant_variants = NONE +/obj/item/clothing/head/soft + mutant_variants = NONE + +/obj/item/clothing/head/flatcap + mutant_variants = NONE + +/obj/item/clothing/head/pirate + mutant_variants = NONE + +/obj/item/clothing/head/rice_hat + mutant_variants = NONE + +/obj/item/clothing/head/ushanka + mutant_variants = NONE + +/obj/item/clothing/head/collectable + mutant_variants = NONE + +/obj/item/clothing/head/fedora + mutant_variants = NONE + +/obj/item/clothing/head/that + mutant_variants = NONE + +/obj/item/clothing/head/rabbitears + mutant_variants = NONE + +/obj/item/clothing/head/mailman + mutant_variants = NONE + +/obj/item/clothing/head/centhat + mutant_variants = NONE + +/obj/item/clothing/head/nursehat + mutant_variants = NONE + +/obj/item/clothing/head/cueball + mutant_variants = NONE + +/obj/item/clothing/head/bandana + mutant_variants = NONE + //EARS>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> //EYES>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> //MASK>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> +/obj/item/clothing/mask/fakemoustache + flags_inv = NONE + //UNDER>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> /obj/item/clothing/under/misc/gear_harness mutant_variants = NONE +/obj/item/clothing/under/costume/maid + mutant_variants = NONE + +/obj/item/clothing/under/costume/schoolgirl + mutant_variants = NONE + //SUIT>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> /obj/item/clothing/suit/toggle/chef mutant_variants = NONE @@ -89,5 +140,10 @@ /obj/item/clothing/suit/jacket mutant_variants = NONE +/obj/item/clothing/suit/ianshirt + mutant_variants = NONE + +/obj/item/clothing/suit/poncho + mutant_variants = NONE //FEET>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> diff --git a/modular_skyrat/modules/customization/modules/clothing/clothing.dm b/modular_skyrat/modules/customization/modules/clothing/clothing.dm index d7bef103813..b275dbc5e21 100644 --- a/modular_skyrat/modules/customization/modules/clothing/clothing.dm +++ b/modular_skyrat/modules/customization/modules/clothing/clothing.dm @@ -1,5 +1,8 @@ -/obj/item/clothing +//Mutant variants needs to be a property of all items, because all items can be equipped, despite the mob code only expecting clothing items (ugh) +/obj/item var/mutant_variants = NONE + +/obj/item/clothing var/worn_icon_digi var/worn_icon_taur_snake var/worn_icon_taur_paw diff --git a/modular_skyrat/modules/customization/modules/clothing/head/head.dm b/modular_skyrat/modules/customization/modules/clothing/head/head.dm index f7b71c6c843..f970634f0ad 100644 --- a/modular_skyrat/modules/customization/modules/clothing/head/head.dm +++ b/modular_skyrat/modules/customization/modules/clothing/head/head.dm @@ -7,6 +7,7 @@ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0.1, "bio" = 0, "rad" = 0, "fire" = -10, "acid" = -15, "wound" = 1) desc = "A dilapidated helmet used in ancient wars. This one is brittle and essentially useless. An ace of spades is tucked into the band around the outer shell." pocket_storage_component_path = /datum/component/storage/concrete/pockets/tiny/spacenam //So you can stuff other things in the elastic band instead of it simply being a fluff thing. + mutant_variants = NONE /datum/component/storage/concrete/pockets/tiny/spacenam attack_hand_interact = TRUE //So you can actually see what you stuff in there @@ -18,6 +19,7 @@ desc = "A standard brown cowboy hat, yeehaw." icon_state = "cowboyhat" inhand_icon_state = "cowboyhat" + mutant_variants = NONE /obj/item/clothing/head/cowboyhat/black name = "black cowboy hat" diff --git a/modular_skyrat/modules/customization/modules/clothing/under/costumes.dm b/modular_skyrat/modules/customization/modules/clothing/under/costumes.dm index bfff783ffe4..c439d4fc464 100644 --- a/modular_skyrat/modules/customization/modules/clothing/under/costumes.dm +++ b/modular_skyrat/modules/customization/modules/clothing/under/costumes.dm @@ -31,7 +31,6 @@ icon_state = "cheong" body_parts_covered = CHEST|GROIN can_adjust = FALSE - mutant_variants = NONE /obj/item/clothing/under/costume/cheongsam/white name = "white cheongsam" diff --git a/modular_skyrat/modules/customization/modules/clothing/under/misc.dm b/modular_skyrat/modules/customization/modules/clothing/under/misc.dm index bef4c8aa575..c54b074492f 100644 --- a/modular_skyrat/modules/customization/modules/clothing/under/misc.dm +++ b/modular_skyrat/modules/customization/modules/clothing/under/misc.dm @@ -5,7 +5,7 @@ icon_state = "stripper_p" body_parts_covered = CHEST|GROIN can_adjust = FALSE - mutantrace_variation = NONE + mutant_variants = NONE /obj/item/clothing/under/misc/stripper/green name = "green stripper outfit" @@ -26,6 +26,8 @@ can_adjust = FALSE /obj/item/clothing/under/misc/gear_harness + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/uniforms.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/uniform.dmi' name = "gear harness" desc = "A simple, inconspicuous harness replacement for a jumpsuit." icon_state = "gear_harness"