Added multiple needed clothes for Hearthkin and fixed some things

code/__DEFINES/mobs.dm

@@ -710,6 +710,10 @@ GLOBAL_LIST_INIT(human_heights_to_offsets, list(
 #define FRONT_MUTATIONS_LAYER 29
 /// Damage indicators (cuts and burns)
 #define DAMAGE_LAYER 28
+/// DOPPLER SHIFT ADDITION BEGIN
+/// Just below clothing layer
+#define UNDER_UNIFORM_LAYER 27.5
+/// DOPPLER SHIFT ADDITION END
 /// Jumpsuit clothing layer
 #define UNIFORM_LAYER 27
 /// DOPPLER SHIFT ADDITION BEGIN

modular_doppler/advanced_reskin/code/advanced_reskin.dm

@@ -10,13 +10,6 @@
 
 	/// Is the obj a glasses icon with swappable item states?
 	var/is_swappable = FALSE
-	// /// if the item are glasses, this variable stores the item.
-	// var/obj/item/clothing/glasses/reskinned_glasses
-
-	// if(istype(src, /obj/item/clothing/glasses)) // TODO - Remove this mess about glasses, it shouldn't be necessary anymore.
-	// 	reskinned_glasses = src
-	// 	if(reskinned_glasses.can_switch_eye)
-	// 		is_swappable = TRUE
 
 	var/list/items = list()
 

modular_doppler/hearthkin/primitive_catgirls/code/clothing_vendor.dm

@@ -3,11 +3,11 @@
 	desc = "It's a big wardrobe filled up with all sorts of clothing."
 	icon = 'icons/obj/storage/closet.dmi'
 	icon_state = "cabinet"
-
 	use_power = FALSE
-
 	shut_up = TRUE
 	vend_reply = null
+	onstation = FALSE // we don't ever want these to be targetable by the brand intelligence event.
+	all_products_free = TRUE // we don't want them to charge anything either. it's a wardrobe.
 
 	products = list(
 		/obj/item/clothing/under/dress/skirt/primitive_catgirl_body_wraps = 15,
@@ -19,19 +19,19 @@
 		/obj/item/clothing/gloves/fingerless/primitive_catgirl_armwraps = 15,
 		/obj/item/clothing/shoes/winterboots/ice_boots/primitive_catgirl_boots = 15,
 		/obj/item/clothing/gloves/fingerless/primitive_catgirl_gauntlets = 10,
-		// /obj/item/clothing/mask/neck_gaiter/primitive_catgirl_gaiter = 10,
-		// /obj/item/clothing/suit/apron/chef/colorable_apron/primitive_catgirl_leather = 10,
-		// /obj/item/clothing/head/standalone_hood/primitive_catgirl_colors = 10,
+		/obj/item/clothing/mask/neck_gaiter/primitive_catgirl_gaiter = 10,
+		/obj/item/clothing/suit/apron/chef/colorable_apron/primitive_catgirl_leather = 10,
+		/obj/item/clothing/head/standalone_hood/primitive_catgirl_colors = 10,
 		/obj/item/clothing/neck/scarf/primitive_catgirl_scarf = 5,
-		// /obj/item/clothing/neck/face_scarf = 5,
+		/obj/item/clothing/neck/face_scarf = 5,
 		/obj/item/clothing/neck/large_scarf/primitive_catgirl_off_white = 5,
 		/obj/item/clothing/neck/infinity_scarf/primitive_catgirl_blue = 5,
-		// /obj/item/clothing/neck/mantle/recolorable/primitive_catgirl_off_white = 5,
+		/obj/item/clothing/neck/mantle/recolorable/primitive_catgirl_off_white = 5,
 		/obj/item/clothing/neck/ranger_poncho/ = 5,
 		/obj/item/clothing/neck/wide_cape = 5,
 		/obj/item/clothing/neck/robe_cape = 5,
 		/obj/item/clothing/neck/long_cape = 5,
-		// /obj/item/clothing/glasses/eyepatch/wrap = 5,
+		/obj/item/clothing/glasses/eyepatch/wrap = 5,
 		/obj/item/clothing/head/primitive_catgirl_ferroniere = 5,
 		/obj/item/clothing/head/pelt/snow_tiger = 5,
 		/obj/item/clothing/head/pelt = 5,
@@ -40,15 +40,10 @@
 		/obj/item/clothing/head/pelt/wolf = 5,
 		/obj/item/clothing/head/pelt/wolf/black = 5,
 		/obj/item/clothing/head/pelt/wolf/white = 5,
-		// /obj/item/clothing/head/costume/nova/papakha = 5,
-		// /obj/item/clothing/head/costume/nova/papakha/white = 5,
-		// /obj/item/clothing/head/hair_tie = 5,
+		/obj/item/clothing/head/costume/papakha = 5,
+		/obj/item/clothing/head/costume/papakha/white = 5,
+		/obj/item/clothing/head/hair_tie = 5,
 	)
 
-/obj/machinery/vending/primitive_catgirl_clothing_vendor/Initialize(mapload)
-	. = ..()
-
-	onstation = FALSE
-
 /obj/machinery/vending/primitive_catgirl_clothing_vendor/speak(message)
 	return

modular_doppler/loadout_categories/categories/glasses.dm

@@ -5,3 +5,11 @@
 /datum/loadout_item/glasses/welding
 	name = "Welding Goggles"
 	item_path = /obj/item/clothing/glasses/welding
+
+/datum/loadout_item/glasses/white_eyepatch
+	name = "White Eyepatch"
+	item_path = /obj/item/clothing/glasses/eyepatch/white
+
+/datum/loadout_item/glasses/eyewrap
+	name = "Eyepatch Wrap"
+	item_path = /obj/item/clothing/glasses/eyepatch/wrap

modular_doppler/loadout_categories/categories/heads.dm

@@ -61,3 +61,11 @@
 /datum/loadout_item/head/colonial_cap
 	name = "Colonial Cap"
 	item_path = /obj/item/clothing/head/hats/colonial
+
+/datum/loadout_item/head/wrussian
+	name = "Black Papakha"
+	item_path = /obj/item/clothing/head/costume/papakha
+
+/datum/loadout_item/head/wrussianw
+	name = "White Papakha"
+	item_path = /obj/item/clothing/head/costume/papakha/white

modular_doppler/loadout_categories/categories/masks.dm

@@ -63,3 +63,7 @@
 /datum/loadout_item/mask/frontier
 	name = "Frontier Gas Mask"
 	item_path = /obj/item/clothing/mask/gas/atmos/frontier_colonist
+
+/datum/loadout_item/mask/frontier
+	name = "Neck Gaiter"
+	item_path = /obj/item/clothing/mask/neck_gaiter

modular_doppler/modular_cosmetics/GAGS/greyscale_configs_face.dm

@@ -0,0 +1,22 @@
+/*                                 \ /  \/ \/  \/  / ,
+                                  \ \ \/ \/ \/ \ \/ \/ /
+                                .\  \/  \/ \/ \/  \/ / / /
+  *hedgehog noise*  )          '  / / \/  \/ \/ \/  \/ \ \/ \
+  This dm contains   \      .'     ) \/ \/ \/ \/  \/  \/ \ / \
+ all face grayscales  \    /   o    ) \/ \/ \/ \/ \/ \/ \// /
+                         o'_ ',__ .'   ,.,.,.,.,.,.,.,'- '
+                                  // \\          // \\
+                                 ''  ''         ''  ''
+*/
+
+// GAITER
+
+/datum/greyscale_config/neck_gaiter
+	name = "Neck Gaiter"
+	icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/face.dmi'
+	json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/face/gaiter.json'
+
+/datum/greyscale_config/neck_gaiter/worn
+	name = "Neck Gaiter (Worn)"
+	icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/face.dmi'
+	json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/face/gaiter_worn.json'

modular_doppler/modular_cosmetics/GAGS/greyscale_configs_head.dm

@@ -0,0 +1,22 @@
+/*                                 \ /  \/ \/  \/  / ,
+                                  \ \ \/ \/ \/ \ \/ \/ /
+                                .\  \/  \/ \/ \/  \/ / / /
+  *hedgehog noise*  )          '  / / \/  \/ \/ \/  \/ \ \/ \
+  This dm contains   \      .'     ) \/ \/ \/ \/  \/  \/ \ / \
+ all head grayscales  \    /   o    ) \/ \/ \/ \/ \/ \/ \// /
+                         o'_ ',__ .'   ,.,.,.,.,.,.,.,'- '
+                                  // \\          // \\
+                                 ''  ''         ''  ''
+*/
+
+// Standalone Hood
+
+/datum/greyscale_config/standalone_hood
+	name = "Hood"
+	icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/head.dmi'
+	json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/head/hood.json'
+
+/datum/greyscale_config/standalone_hood/worn
+	name = "Hood (Worn)"
+	icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/head.dmi'
+	json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/head/hood_worn.json'

modular_doppler/modular_cosmetics/GAGS/greyscale_configs_neck.dm

@@ -147,3 +147,17 @@
 /datum/greyscale_config/collar/spike/worn
 	name = "Spiked Collar (Worn)"
 	json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/collar/spike_worn.json'
+
+///////////
+//MANTLES//
+///////////
+
+/datum/greyscale_config/mantle
+	name = "Mantle"
+	icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/neck.dmi'
+	json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/neck/mantle.json'
+
+/datum/greyscale_config/mantle/worn
+	name = "Mantle (Worn)"
+	icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/neck.dmi'
+	json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/neck/mantle_worn.json'

modular_doppler/modular_cosmetics/GAGS/greyscale_configs_suit.dm

@@ -62,3 +62,15 @@
 	name = "'dagger' designer mantle (worn)"
 	icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/shirt.dmi'
 	json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/dagger_mantle_worn.json'
+
+// Apron
+
+/datum/greyscale_config/apron
+	name = "Apron"
+	icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/suit.dmi'
+	json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/apron.json'
+
+/datum/greyscale_config/apron/worn
+	name = "Apron (Worn)"
+	icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/suit.dmi'
+	json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/apron_worn.json'

modular_doppler/modular_cosmetics/GAGS/json_configs/face/gaiter.json

@@ -0,0 +1,18 @@
+{
+	"gaiter": [
+		{
+			"type": "icon_state",
+			"icon_state": "gaiter_obj",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	],
+	"gaiter_up": [
+		{
+			"type": "icon_state",
+			"icon_state": "gaiter_obj_up",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}

modular_doppler/modular_cosmetics/GAGS/json_configs/face/gaiter_worn.json

@@ -0,0 +1,18 @@
+{
+	"gaiter": [
+		{
+			"type": "icon_state",
+			"icon_state": "gaiter",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	],
+	"gaiter_up": [
+		{
+			"type": "icon_state",
+			"icon_state": "gaiter_up",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}

modular_doppler/modular_cosmetics/GAGS/json_configs/head/hood.json

@@ -0,0 +1,16 @@
+{
+	"hood": [
+		{
+			"type": "icon_state",
+			"icon_state": "hood_obj",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "hood_neck_obj",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		}
+	]
+}

modular_doppler/modular_cosmetics/GAGS/json_configs/head/hood_worn.json

@@ -0,0 +1,16 @@
+{
+	"hood": [
+		{
+			"type": "icon_state",
+			"icon_state": "hood",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "hood_neck",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		}
+	]
+}

modular_doppler/modular_cosmetics/GAGS/json_configs/neck/mantle.json

@@ -0,0 +1,10 @@
+{
+	"mantle": [
+		{
+			"type": "icon_state",
+			"icon_state": "mantle_obj",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}

modular_doppler/modular_cosmetics/GAGS/json_configs/neck/mantle_worn.json

@@ -0,0 +1,10 @@
+{
+	"mantle": [
+		{
+			"type": "icon_state",
+			"icon_state": "mantle",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}

modular_doppler/modular_cosmetics/GAGS/json_configs/suit/apron.json

@@ -0,0 +1,10 @@
+{
+	"apron": [
+		{
+			"type": "icon_state",
+			"icon_state": "apron_obj",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}

modular_doppler/modular_cosmetics/GAGS/json_configs/suit/apron_worn.json

@@ -0,0 +1,10 @@
+{
+	"apron": [
+		{
+			"type": "icon_state",
+			"icon_state": "apron",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}

modular_doppler/modular_cosmetics/code/face/glasses.dm

@@ -0,0 +1,24 @@
+/obj/item/clothing/glasses/eyepatch/wrap
+	name = "eye wrap"
+	desc = "A glorified bandage. At least this one's actually made for your head..."
+	icon = 'modular_doppler/modular_cosmetics/icons/obj/face/glasses.dmi'
+	worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/face/glasses.dmi'
+	icon_state = "eyewrap"
+	base_icon_state = "eyewrap"
+
+/obj/item/clothing/glasses/eyepatch/white
+	name = "white eyepatch"
+	desc = "This is what happens when a pirate gets a PhD."
+	icon = 'modular_doppler/modular_cosmetics/icons/obj/face/glasses.dmi'
+	worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/face/glasses.dmi'
+	icon_state = "eyepatch_white"
+	base_icon_state = "eyepatch_white"
+
+/obj/item/clothing/glasses/examine(mob/user)
+	. = ..()
+	if(locate(/datum/action/item_action/flip) in actions)
+		. += "Use in hands to wear it over your [icon_state == base_icon_state ? "left" : "right"] eye."
+
+// /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch/examine(mob/user)
+// 	. = ..()
+// 	. += "Use in hands to wear it over your [icon_state == base_icon_state ? "left" : "right"] eye."

modular_doppler/modular_cosmetics/code/face/masks.dm

@@ -0,0 +1,41 @@
+/obj/item/clothing/mask/neck_gaiter
+	name = "neck gaiter"
+	desc = "A cloth for covering your neck, and usually part of your face too, but that part's optional. Has a small respirator to be used with internals."
+	actions_types = list(/datum/action/item_action/adjust)
+	alternate_worn_layer = UNDER_UNIFORM_LAYER
+	icon_state = "gaiter"
+	icon = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/face.dmi'
+	worn_icon = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/face.dmi'
+	supported_bodyshapes = null
+	bodyshape_icon_files = null
+	inhand_icon_state = "balaclava"
+	greyscale_config = /datum/greyscale_config/neck_gaiter
+	greyscale_config_worn = /datum/greyscale_config/neck_gaiter/worn
+	greyscale_colors = "#666666"
+	clothing_flags = BLOCK_GAS_SMOKE_EFFECT|MASKINTERNALS
+	w_class = WEIGHT_CLASS_SMALL
+	flags_inv = HIDEFACIALHAIR | HIDEFACE | HIDESNOUT
+	visor_flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
+	visor_flags_inv = HIDEFACIALHAIR | HIDEFACE | HIDESNOUT
+	flags_cover = MASKCOVERSMOUTH
+	visor_flags_cover = MASKCOVERSMOUTH
+	flags_1 = IS_PLAYER_COLORABLE_1
+	interaction_flags_click = NEED_DEXTERITY|ALLOW_RESTING
+
+/obj/item/clothing/mask/neck_gaiter/attack_self(mob/user)
+	adjust_visor(user)
+
+/obj/item/clothing/mask/neck_gaiter/click_alt(mob/user)
+	adjust_visor(user)
+	return CLICK_ACTION_SUCCESS
+
+/obj/item/clothing/mask/neck_gaiter/click_alt_secondary(mob/user)
+	alternate_worn_layer = (alternate_worn_layer == initial(alternate_worn_layer) ? NONE : initial(alternate_worn_layer))
+	user.update_clothing(ITEM_SLOT_MASK)
+	balloon_alert(user, "wearing [alternate_worn_layer == initial(alternate_worn_layer) ? "below" : "above"] suits")
+
+/obj/item/clothing/mask/neck_gaiter/examine(mob/user)
+	. = ..()
+	. += span_notice("[src] can be worn above or below your suit. Alt-Right-click to toggle.")
+	. += span_notice("Alt-click [src] to adjust it.")
+