diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index acb2b4e13c..c07290cdaf 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -123,6 +123,24 @@ category = slot_w_uniform path = /obj/item/clothing/under/syndicate/cosmetic +/datum/gear/polykilt + name = "Polychromic Kilt" + category = slot_w_uniform + path = /obj/item/clothing/under/polychromic/kilt + cost = 3 + +/datum/gear/polyshorts + name = "Polychromic Shorts" + category = slot_w_uniform + path = /obj/item/clothing/under/polychromic/shorts + cost = 3 + +/datum/gear/polyshortpants + name = "Polychromic Athletic Shorts" + category = slot_w_uniform + path = /obj/item/clothing/under/polychromic/shortpants + cost = 2 + // Trekie things //TOS /datum/gear/trekcmdtos diff --git a/modular_citadel/code/modules/clothing/clothing.dm b/modular_citadel/code/modules/clothing/clothing.dm index ead9e70d14..d638f59808 100644 --- a/modular_citadel/code/modules/clothing/clothing.dm +++ b/modular_citadel/code/modules/clothing/clothing.dm @@ -5,6 +5,31 @@ // // *///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// COPYPASTE THE FOLLOWING PROC TO WHATEVER CATERGORY OF CLOTHING YOU WANT TO POLYCHROME + +// THIS IS REQUIRED DUE TO EACH CLOTHING CATEGORY HAVING A SNOWFLAKE WORN_OVERLAYS() THING + +// Don't forget to append the appropriate typepath! Also, refer to polychromic_clothes.dm for example implementations + +/* +/obj/item/clothing/worn_overlays(isinhands, icon_file) //this is where the main magic happens. Also mandates that ALL polychromic stuff MUST USE alternate_worn_icon + . = ..() + if(hasprimary | hassecondary | hastertiary) + if(!isinhands) //prevents the worn sprites from showing up if you're just holding them + if(hasprimary) //checks if overlays are enabled + var/mutable_appearance/primary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-primary") //automagical sprite selection + primary_worn.color = primary_color //colors the overlay + . += primary_worn //adds the overlay onto the buffer list to draw on the mob sprite. + if(hassecondary) + var/mutable_appearance/secondary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-secondary") + secondary_worn.color = secondary_color + . += secondary_worn + if(hastertiary) + var/mutable_appearance/tertiary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-tertiary") + tertiary_worn.color = tertiary_color + . += tertiary_worn +*/ + /obj/item/clothing/ var/hasprimary = FALSE //These vars allow you to choose which overlays a clothing has var/hassecondary = FALSE @@ -52,23 +77,6 @@ update_icon() user.update_inv_w_uniform() -/obj/item/clothing/worn_overlays(isinhands, icon_file) //this is where the main magic happens. Also mandates that ALL polychromic stuff MUST USE alternate_worn_icon - . = ..() - if(hasprimary | hassecondary | hastertiary) - if(!isinhands) //prevents the worn sprites from showing up if you're just holding them - if(hasprimary) //checks if overlays are enabled - var/mutable_appearance/primary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-primary") //automagical sprite selection - primary_worn.color = primary_color //colors the overlay - . += primary_worn //adds the overlay onto the buffer list to draw on the mob sprite. - if(hassecondary) - var/mutable_appearance/secondary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-secondary") - secondary_worn.color = secondary_color - . += secondary_worn - if(hastertiary) - var/mutable_appearance/tertiary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-tertiary") - tertiary_worn.color = tertiary_color - . += tertiary_worn - /obj/item/clothing/examine(mob/user) ..() if(hasprimary | hassecondary | hastertiary) diff --git a/modular_citadel/code/modules/clothing/under/polychromic_clothes.dm b/modular_citadel/code/modules/clothing/under/polychromic_clothes.dm index b2b0fa7903..4f8985dac5 100644 --- a/modular_citadel/code/modules/clothing/under/polychromic_clothes.dm +++ b/modular_citadel/code/modules/clothing/under/polychromic_clothes.dm @@ -26,7 +26,24 @@ primary_color = "#FFFFFF" //RGB in hexcode secondary_color = "#FFFFFF" tertiary_color = "#808080" - can_adjust = FALSE //Don't touch this var unless you know what you're doing + can_adjust = FALSE + +/obj/item/clothing/under/polychromic/worn_overlays(isinhands, icon_file) //this is where the main magic happens. Also mandates that ALL polychromic stuff MUST USE alternate_worn_icon + . = ..() + if(hasprimary | hassecondary | hastertiary) + if(!isinhands) //prevents the worn sprites from showing up if you're just holding them + if(hasprimary) //checks if overlays are enabled + var/mutable_appearance/primary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-primary") //automagical sprite selection + primary_worn.color = primary_color //colors the overlay + . += primary_worn //adds the overlay onto the buffer list to draw on the mob sprite. + if(hassecondary) + var/mutable_appearance/secondary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-secondary") + secondary_worn.color = secondary_color + . += secondary_worn + if(hastertiary) + var/mutable_appearance/tertiary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-tertiary") + tertiary_worn.color = tertiary_color + . += tertiary_worn /obj/item/clothing/under/polychromic/shirt //COPY PASTE THIS TO MAKE A NEW THING name = "polychromic button-up shirt" diff --git a/tgstation.dme b/tgstation.dme index 07746da3b9..676c1f5cb4 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2689,7 +2689,6 @@ #include "modular_citadel\code\modules\admin\topic.dm" #include "modular_citadel\code\modules\antagonists\cit_crewobjectives.dm" #include "modular_citadel\code\modules\antagonists\cit_miscreants.dm" -#include "modular_citadel\code\modules\antagonists\cult\blood_magic.dm" #include "modular_citadel\code\modules\antagonists\crew_objectives\cit_crewobjectives_cargo.dm" #include "modular_citadel\code\modules\antagonists\crew_objectives\cit_crewobjectives_civilian.dm" #include "modular_citadel\code\modules\antagonists\crew_objectives\cit_crewobjectives_command.dm" @@ -2697,6 +2696,7 @@ #include "modular_citadel\code\modules\antagonists\crew_objectives\cit_crewobjectives_medical.dm" #include "modular_citadel\code\modules\antagonists\crew_objectives\cit_crewobjectives_science.dm" #include "modular_citadel\code\modules\antagonists\crew_objectives\cit_crewobjectives_security.dm" +#include "modular_citadel\code\modules\antagonists\cult\blood_magic.dm" #include "modular_citadel\code\modules\arousal\arousal.dm" #include "modular_citadel\code\modules\arousal\organs\breasts.dm" #include "modular_citadel\code\modules\arousal\organs\eggsack.dm" @@ -2731,6 +2731,7 @@ #include "modular_citadel\code\modules\client\loadout\suit.dm" #include "modular_citadel\code\modules\client\loadout\uniform.dm" #include "modular_citadel\code\modules\client\verbs\who.dm" +#include "modular_citadel\code\modules\clothing\clothing.dm" #include "modular_citadel\code\modules\clothing\spacesuits\flightsuit.dm" #include "modular_citadel\code\modules\clothing\suits\suits.dm" #include "modular_citadel\code\modules\clothing\under\polychromic_clothes.dm"