diff --git a/modular_skyrat/modules/customization/icons/mob/clothing/neck.dmi b/modular_skyrat/modules/customization/icons/mob/clothing/neck.dmi index da5e65c9d4a..801575fe28b 100644 Binary files a/modular_skyrat/modules/customization/icons/mob/clothing/neck.dmi and b/modular_skyrat/modules/customization/icons/mob/clothing/neck.dmi differ diff --git a/modular_skyrat/modules/customization/icons/mob/clothing/suit.dmi b/modular_skyrat/modules/customization/icons/mob/clothing/suit.dmi index 99e05acea4b..979c1fc7d1d 100644 Binary files a/modular_skyrat/modules/customization/icons/mob/clothing/suit.dmi and b/modular_skyrat/modules/customization/icons/mob/clothing/suit.dmi differ diff --git a/modular_skyrat/modules/customization/icons/mob/clothing/uniform.dmi b/modular_skyrat/modules/customization/icons/mob/clothing/uniform.dmi index ca82a6ffccb..04d314b1ed0 100644 Binary files a/modular_skyrat/modules/customization/icons/mob/clothing/uniform.dmi and b/modular_skyrat/modules/customization/icons/mob/clothing/uniform.dmi differ diff --git a/modular_skyrat/modules/customization/icons/obj/clothing/neck.dmi b/modular_skyrat/modules/customization/icons/obj/clothing/neck.dmi index d90044d2956..ab482c1d827 100644 Binary files a/modular_skyrat/modules/customization/icons/obj/clothing/neck.dmi and b/modular_skyrat/modules/customization/icons/obj/clothing/neck.dmi differ diff --git a/modular_skyrat/modules/customization/icons/obj/clothing/suits.dmi b/modular_skyrat/modules/customization/icons/obj/clothing/suits.dmi index 15bba73aa16..e89a4c866c0 100644 Binary files a/modular_skyrat/modules/customization/icons/obj/clothing/suits.dmi and b/modular_skyrat/modules/customization/icons/obj/clothing/suits.dmi differ diff --git a/modular_skyrat/modules/customization/icons/obj/clothing/uniforms.dmi b/modular_skyrat/modules/customization/icons/obj/clothing/uniforms.dmi index 9de08554aa3..79f67bd518e 100644 Binary files a/modular_skyrat/modules/customization/icons/obj/clothing/uniforms.dmi and b/modular_skyrat/modules/customization/icons/obj/clothing/uniforms.dmi differ diff --git a/modular_skyrat/modules/customization/modules/client/loadout/donator/personal/donator_personal.dm b/modular_skyrat/modules/customization/modules/client/loadout/donator/personal/donator_personal.dm index 4f9e0bd69e8..e6d98976da3 100644 --- a/modular_skyrat/modules/customization/modules/client/loadout/donator/personal/donator_personal.dm +++ b/modular_skyrat/modules/customization/modules/client/loadout/donator/personal/donator_personal.dm @@ -193,4 +193,4 @@ /datum/loadout_item/backpack/donator/intern_hat name = "Intern Hat" path = /obj/item/clothing/head/intern/developer - ckeywhitelist = list("gandalf2k15", "yawet330", "junglerat", "theooz", "tf4", "cheshify", "swiftfeather", "spcr", "tygertac", "useroth") + ckeywhitelist = list("gandalf2k15", "yawet330", "junglerat", "theooz", "tf4", "cheshify", "swiftfeather", "spcr", "tygertac", "useroth", "slippyjoe") diff --git a/modular_skyrat/modules/customization/modules/client/loadout/neck.dm b/modular_skyrat/modules/customization/modules/client/loadout/neck.dm index b98721a7c17..0619f48ea7f 100644 --- a/modular_skyrat/modules/customization/modules/client/loadout/neck.dm +++ b/modular_skyrat/modules/customization/modules/client/loadout/neck.dm @@ -21,6 +21,26 @@ path = /obj/item/clothing/neck/human_petcollar/leather extra_info = LOADOUT_INFO_THREE_COLORS +/datum/loadout_item/neck/cbellcollar + name = "Cowbell collar" + path = /obj/item/clothing/neck/human_petcollar/locked/cowcollar + +/datum/loadout_item/neck/bellcollar + name = "Bell collar" + path = /obj/item/clothing/neck/human_petcollar/locked/bellcollar + +/datum/loadout_item/neck/spikecollar + name = "Spike collar" + path = /obj/item/clothing/neck/human_petcollar/locked/spikecollar + +/datum/loadout_item/neck/hcollar + name = "Holocollar" + path = /obj/item/clothing/neck/human_petcollar/locked/holocollar + +/datum/loadout_item/neck/crosscollar + name = "Cross collar" + path = /obj/item/clothing/neck/human_petcollar/locked/cross + /datum/loadout_item/neck/poly_cloak name = "Polychromic Cloak" path = /obj/item/clothing/neck/cloak/polychromic diff --git a/modular_skyrat/modules/customization/modules/client/loadout/suit.dm b/modular_skyrat/modules/customization/modules/client/loadout/suit.dm index 1cab197e87b..e7212a0c9b7 100644 --- a/modular_skyrat/modules/customization/modules/client/loadout/suit.dm +++ b/modular_skyrat/modules/customization/modules/client/loadout/suit.dm @@ -36,6 +36,16 @@ name = "Tailcoat" path = /obj/item/clothing/suit/costume/tailcoat +/datum/loadout_item/suit/duster + name = "Colorable Duster" + path = /obj/item/clothing/suit/duster/colorable + extra_info = LOADOUT_INFO_ONE_COLOR + +/datum/loadout_item/suit/peacoat + name = "Colorable Peacoat" + path = /obj/item/clothing/suit/toggle/peacoat + extra_info = LOADOUT_INFO_ONE_COLOR + /datum/loadout_item/suit/dresscoat name = "Black Dresscoat" path = /obj/item/clothing/suit/costume/vic_dresscoat diff --git a/modular_skyrat/modules/customization/modules/client/loadout/uniform.dm b/modular_skyrat/modules/customization/modules/client/loadout/uniform.dm index 32e8ad5b0d7..0a8cd1ce22c 100644 --- a/modular_skyrat/modules/customization/modules/client/loadout/uniform.dm +++ b/modular_skyrat/modules/customization/modules/client/loadout/uniform.dm @@ -2,6 +2,11 @@ category = LOADOUT_CATEGORY_UNIFORM //MISC +/datum/loadout_item/uniform/gandalf + name = "Nostalgic Costume" + path = /obj/item/clothing/under/nostalgiacritic + ckeywhitelist = list("gandalf2k15") + /datum/loadout_item/uniform/assistantformal name = "Assistant's formal uniform" path = /obj/item/clothing/under/misc/assistantformal diff --git a/modular_skyrat/modules/customization/modules/clothing/neck/collars.dm b/modular_skyrat/modules/customization/modules/clothing/neck/collars.dm index 2d54b50de91..56bb98d21d1 100644 --- a/modular_skyrat/modules/customization/modules/clothing/neck/collars.dm +++ b/modular_skyrat/modules/customization/modules/clothing/neck/collars.dm @@ -90,3 +90,42 @@ /obj/item/key/collar name = "Collar Key" desc = "A key for a tiny lock on a collar or bag." + +/obj/item/clothing/neck/human_petcollar/locked/cowcollar + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/neck.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/neck.dmi' + name = "cowbell collar" + desc = "Don't fear the ripper, now your pet doesn't have to." + icon_state = "collar_cowbell" + +/obj/item/clothing/neck/human_petcollar/locked/bellcollar + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/neck.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/neck.dmi' + name = "bell collar" + desc = "A loud and annoying collar for your little kittens!" + icon_state = "collar_bell" + +/obj/item/clothing/neck/human_petcollar/locked/spikecollar + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/neck.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/neck.dmi' + name = "spiked collar" + desc = "A collar for moody pets. Or pitbulls." + icon_state = "collar_spik" + +/obj/item/clothing/neck/human_petcollar/locked/holocollar + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/neck.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/neck.dmi' + name = "holocollar" + desc = "A collar with holographic information, like a microchip, but around the neck." + icon_state = "collar_holo" + +/obj/item/clothing/neck/human_petcollar/locked/cross + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/neck.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/neck.dmi' + name = "cross collar" + desc = "A religious punishment, probably." + icon_state = "collar_blk" + + + + diff --git a/modular_skyrat/modules/customization/modules/clothing/suits/coats.dm b/modular_skyrat/modules/customization/modules/clothing/suits/coats.dm index e4792edb24a..0184f7d049d 100644 --- a/modular_skyrat/modules/customization/modules/clothing/suits/coats.dm +++ b/modular_skyrat/modules/customization/modules/clothing/suits/coats.dm @@ -230,3 +230,30 @@ mutant_variants = NONE +/obj/item/clothing/suit/duster/colorable + name = "colorable duster" + desc = "This station aint big enough for the both of us." + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/suits.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/suit.dmi' + icon_state = "duster" + mutant_variants = NONE + +/obj/item/clothing/suit/duster/colorable/ComponentInitialize() + . = ..() + AddElement(/datum/element/polychromic, list("5D5")) + +/obj/item/clothing/suit/toggle/peacoat + name = "colorable peacoat" + desc = "The way you guys are blending in with the local colour. I mean, Flag Girl was bad enough, but U-Boat Captain?" + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/suits.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/suit.dmi' + icon_state = "peacoat" + mutant_variants = NONE + +/obj/item/clothing/suit/toggle/peacoat/ComponentInitialize() + . = ..() + AddElement(/datum/element/polychromic, list("5D5")) + + + + diff --git a/modular_skyrat/modules/customization/modules/clothing/under/misc.dm b/modular_skyrat/modules/customization/modules/clothing/under/misc.dm index c46056c655f..9d750f4e19b 100644 --- a/modular_skyrat/modules/customization/modules/clothing/under/misc.dm +++ b/modular_skyrat/modules/customization/modules/clothing/under/misc.dm @@ -394,5 +394,12 @@ worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/uniform.dmi' icon_state = "rusuni" +/obj/item/clothing/under/nostalgiacritic + name = "nostalgic outfit" + desc = "He remembers it so you don't have to." + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/uniforms.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/uniform.dmi' + icon_state = "cia" + diff --git a/modular_skyrat/modules/customization/modules/clothing/under/security.dm b/modular_skyrat/modules/customization/modules/clothing/under/security.dm index 833c0a97f17..7936900ad8e 100644 --- a/modular_skyrat/modules/customization/modules/clothing/under/security.dm +++ b/modular_skyrat/modules/customization/modules/clothing/under/security.dm @@ -155,6 +155,10 @@ icon = 'modular_skyrat/modules/customization/icons/obj/clothing/uniforms.dmi' worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/uniform.dmi' icon_state = "prisonerclassic" + body_parts_covered = CHEST|GROIN|ARMS|LEGS + has_sensor = LOCKED_SENSORS + sensor_mode = SENSOR_COORDS + random_sensor = FALSE ///CDO /obj/item/clothing/under/rank/security/peacekeeper/junior/sol