diff --git a/code/game/objects/structures/crates_lockers/closets/fitness.dm b/code/game/objects/structures/crates_lockers/closets/fitness.dm index ad493dd6..ad0e16a9 100644 --- a/code/game/objects/structures/crates_lockers/closets/fitness.dm +++ b/code/game/objects/structures/crates_lockers/closets/fitness.dm @@ -12,6 +12,11 @@ new /obj/item/clothing/under/shorts/blue(src) new /obj/item/clothing/under/shorts/green(src) new /obj/item/clothing/under/jabroni(src) + new /obj/item/clothing/under/shorts/redwshort(src) + new /obj/item/clothing/under/shorts/yellowwshort(src) + new /obj/item/clothing/under/shorts/pinkwshort(src) + new /obj/item/clothing/under/polychromic/bikini(src) + new /obj/item/clothing/under/polychromic/stripper(src) /obj/structure/closet/boxinggloves diff --git a/modular_citadel/code/game/machinery/vending.dm b/modular_citadel/code/game/machinery/vending.dm index 109484ff..f6aaf436 100644 --- a/modular_citadel/code/game/machinery/vending.dm +++ b/modular_citadel/code/game/machinery/vending.dm @@ -58,7 +58,8 @@ /obj/item/clothing/under/polychromic/shortpants/pantsu = 3, /obj/item/clothing/under/polychromic/bulge = 3, /obj/item/clothing/suit/maidapron = 3, - /obj/item/clothing/under/corset = 3 + /obj/item/clothing/under/corset = 3, + /obj/item/clothing/under/jabroni = 3 ) contraband = list(/obj/item/restraints/handcuffs/fake/kinky = 5, /obj/item/clothing/neck/petcollar = 5, diff --git a/modular_citadel/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/modular_citadel/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index e565894a..263e8a49 100644 --- a/modular_citadel/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/modular_citadel/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -42,6 +42,9 @@ new /obj/item/clothing/shoes/sneakers/black(src) new /obj/item/clothing/shoes/sneakers/brown(src) new /obj/item/clothing/shoes/sneakers/white(src) + new /obj/item/clothing/suit/polychromic/kromajacket(src) + new /obj/item/clothing/suit/polychromic/kromacrop(src) + new /obj/item/clothing/under/polychromic/shortsbra(src) if(prob(30)) new /obj/item/clothing/suit/hooded/wintercoat(src) new /obj/item/clothing/shoes/winterboots(src) diff --git a/modular_citadel/code/modules/client/loadout/suit.dm b/modular_citadel/code/modules/client/loadout/suit.dm index bcbd8f4d..cef77bd2 100644 --- a/modular_citadel/code/modules/client/loadout/suit.dm +++ b/modular_citadel/code/modules/client/loadout/suit.dm @@ -172,4 +172,14 @@ /datum/gear/christmascoatrg name = "Red and Green Christmas Coat" category = SLOT_WEAR_SUIT - path = /obj/item/clothing/suit/hooded/wintercoat/christmascoatrg \ No newline at end of file + path = /obj/item/clothing/suit/hooded/wintercoat/christmascoatrg + +/datum/gear/kromajacket + name = "Kromatose Military Jacket" + category = SLOT_WEAR_SUIT + path = /obj/item/clothing/suit/polychromic/kromajacket + +/datum/gear/kromacrop + name = "Kromatose Short Jacket" + category = SLOT_WEAR_SUIT + path = /obj/item/clothing/suit/polychromic/kromacrop \ No newline at end of file diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index a2d38bd3..eb75c01c 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -450,3 +450,15 @@ category = SLOT_W_UNIFORM path = /obj/item/clothing/under/corset cost = 1 + +/datum/gear/corset + name = "Corset" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/corset + cost = 1 + +/datum/gear/shortsbra + name = "Kromatic Shorts and Top" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/polychromic/shortsbra + cost = 1 diff --git a/modular_citadel/code/modules/clothing/suits/polychromic_suit.dm b/modular_citadel/code/modules/clothing/suits/polychromic_suit.dm new file mode 100644 index 00000000..9e6f1501 --- /dev/null +++ b/modular_citadel/code/modules/clothing/suits/polychromic_suit.dm @@ -0,0 +1,56 @@ +/obj/item/clothing/suit/polychromic //enables all three overlays to reduce copypasta and defines basic stuff + name = "Kromatose Jacket" + desc = "A polychromatic jacket" + icon = 'modular_citadel/icons/polyclothes/item/suit.dmi' + alternate_worn_icon = 'modular_citadel/icons/polyclothes/mob/suit.dmi' + icon_state = "kromajacket" + item_color = "kromajacket" + item_state = "militaryjacket" + hasprimary = TRUE + hassecondary = TRUE + hastertiary = TRUE + primary_color = "#FFFFFF" //RGB in hexcode + secondary_color = "#FFFFFF" + tertiary_color = "#808080" + mutantrace_variation = NO_MUTANTRACE_VARIATION + +/obj/item/clothing/suit/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/suit/polychromic/kromajacket + name = "Kromatose Military Jacket" + desc = "A polychromatic jacket, in the military style" + icon_state = "kromajacket" + item_color = "kromajacket" + item_state = "militaryjacket" + primary_color = "#FFFFFF" //RGB in hexcode + secondary_color = "#353535" + tertiary_color = "#353535" + body_parts_covered= CHEST|GROIN|ARMS + allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver, /obj/item/radio) + +/obj/item/clothing/suit/polychromic/kromacrop + name = "Kromatose Short Jacket" + desc = "A short polychromatic jacket, in the military style" + icon_state = "kromacrop" + item_color = "kromacrop" + item_state = "militaryjacket" + primary_color = "#FFFFFF" //RGB in hexcode + secondary_color = "#353535" + tertiary_color = "#353535" + body_parts_covered= CHEST|GROIN|ARMS + allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver, /obj/item/radio) \ No newline at end of file diff --git a/modular_citadel/code/modules/clothing/under/polychromic_clothes.dm b/modular_citadel/code/modules/clothing/under/polychromic_clothes.dm index d89a9708..1a26629e 100644 --- a/modular_citadel/code/modules/clothing/under/polychromic_clothes.dm +++ b/modular_citadel/code/modules/clothing/under/polychromic_clothes.dm @@ -198,4 +198,15 @@ hastertiary = FALSE primary_color = "#808080" //RGB in hexcode secondary_color = "#FF3535" - body_parts_covered = GROIN \ No newline at end of file + body_parts_covered = GROIN + +/obj/item/clothing/under/polychromic/shortsbra + name = "Kromatic Shorts and Top" + desc = "A pair of shorts and a bikini top! They even change color!" + icon_state = "shortsbra" + item_color = "shortsbra" + item_state = "rainbow" + primary_color = "#808080" //RGB in hexcode + secondary_color = "#FFFFFF" + hastertiary = FALSE + body_parts_covered= CHEST|GROIN \ No newline at end of file diff --git a/modular_citadel/icons/polyclothes/item/suit.dmi b/modular_citadel/icons/polyclothes/item/suit.dmi new file mode 100644 index 00000000..2ebcd837 Binary files /dev/null and b/modular_citadel/icons/polyclothes/item/suit.dmi differ diff --git a/modular_citadel/icons/polyclothes/item/uniform.dmi b/modular_citadel/icons/polyclothes/item/uniform.dmi index d47f0df0..42e122d9 100644 Binary files a/modular_citadel/icons/polyclothes/item/uniform.dmi and b/modular_citadel/icons/polyclothes/item/uniform.dmi differ diff --git a/modular_citadel/icons/polyclothes/mob/suit.dmi b/modular_citadel/icons/polyclothes/mob/suit.dmi new file mode 100644 index 00000000..f0b3d783 Binary files /dev/null and b/modular_citadel/icons/polyclothes/mob/suit.dmi differ diff --git a/modular_citadel/icons/polyclothes/mob/uniform.dmi b/modular_citadel/icons/polyclothes/mob/uniform.dmi index dfdca385..b698c210 100644 Binary files a/modular_citadel/icons/polyclothes/mob/uniform.dmi and b/modular_citadel/icons/polyclothes/mob/uniform.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 47b06f80..034eb157 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3104,6 +3104,7 @@ #include "modular_citadel\code\modules\clothing\spacesuits\cydonian_armor.dm" #include "modular_citadel\code\modules\clothing\spacesuits\flightsuit.dm" #include "modular_citadel\code\modules\clothing\suits\polychromic_cloaks.dm" +#include "modular_citadel\code\modules\clothing\suits\polychromic_suit.dm" #include "modular_citadel\code\modules\clothing\suits\suits.dm" #include "modular_citadel\code\modules\clothing\under\polychromic_clothes.dm" #include "modular_citadel\code\modules\clothing\under\trek_under.dm"