From dbb6218e0d933ca24a944d5b9bb66de9e88b1012 Mon Sep 17 00:00:00 2001 From: Seris02 Date: Thu, 30 Jan 2020 14:54:07 +0800 Subject: [PATCH] merp --- .../objects/structures/crates_lockers/closets/wardrobe.dm | 4 ++++ code/modules/clothing/suits/miscellaneous.dm | 3 +++ code/modules/vending/clothesmate.dm | 3 ++- modular_citadel/code/modules/client/loadout/suit.dm | 6 ++++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 9d554181eb..63c8856ac3 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -126,8 +126,10 @@ new /obj/item/clothing/mask/bandana/black(src) if(prob(40)) new /obj/item/clothing/under/assistantformal(src) + new /obj/item/clothing/suit/hooded/wintercoat/aformal(src) if(prob(40)) new /obj/item/clothing/under/assistantformal(src) + new /obj/item/clothing/suit/hooded/wintercoat/aformal(src) if(prob(30)) new /obj/item/clothing/suit/hooded/wintercoat(src) new /obj/item/clothing/shoes/winterboots(src) @@ -169,4 +171,6 @@ if(prob(30)) new /obj/item/clothing/suit/hooded/wintercoat(src) new /obj/item/clothing/shoes/winterboots(src) + if (prob(30)) + new /obj/item/clothing/suit/hooded/wintercoat/polychromic(src) return diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 8d070071e5..84609e29d8 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -932,6 +932,9 @@ hasprimary = TRUE hassecondary = TRUE hastertiary = TRUE + primary_color = "#6A6964" + secondary_color = "#C4B8A6" + tertiary_color = "#0000FF" /obj/item/clothing/head/hooded/winterhood/polychromic icon_state = "winterhood_poly" diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index af720f6d4e..e74e82351b 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -170,7 +170,8 @@ /obj/item/clothing/suit/jacket/leather/overcoat = 4, /obj/item/clothing/under/pants/mustangjeans = 3, /obj/item/clothing/neck/necklace/dope = 5, - /obj/item/clothing/suit/jacket/letterman_nanotrasen = 5) + /obj/item/clothing/suit/jacket/letterman_nanotrasen = 5, + /obj/item/clothing/suit/hooded/wintercoat/polychromic = 5) refill_canister = /obj/item/vending_refill/clothing /obj/item/vending_refill/clothing diff --git a/modular_citadel/code/modules/client/loadout/suit.dm b/modular_citadel/code/modules/client/loadout/suit.dm index d5f2e3cbd1..9b39d006bd 100644 --- a/modular_citadel/code/modules/client/loadout/suit.dm +++ b/modular_citadel/code/modules/client/loadout/suit.dm @@ -79,6 +79,12 @@ category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/hooded/wintercoat/ratvar/fake +/datum/gear/coat/polycoat + name = "Polychromic winter coat" + category = SLOT_WEAR_SUIT + path = /obj/item/clothing/suit/hooded/wintercoat/polychromic + cost = 4 //too many people with neon green coats is hard on the eyes + /* Commented out until it is "balanced" /datum/gear/coat/sec name = "Security winter coat"