dripocalypse how: fixes and improves the moto leggings and adds FOUR new items

modular_doppler/loadout_categories/categories/shoes.dm

@@ -141,6 +141,10 @@
 	name = "White Sneakers"
 	item_path = /obj/item/clothing/shoes/sneakers/white
 
+/datum/loadout_item/shoes/other/geowpn
+	name = "GEOWPN Sneakers"
+	item_path = /obj/item/clothing/shoes/geowpn
+
 /datum/loadout_item/shoes/other/sandals
 	name = "Sandals"
 	item_path = /obj/item/clothing/shoes/sandal

modular_doppler/loadout_categories/categories/suit.dm

@@ -263,6 +263,10 @@
 	name = "Crop-top Jacket"
 	item_path = /obj/item/clothing/suit/jacket/doppler/gacket
 
+/datum/loadout_item/suit/bad_for_school
+	name = "Bad for School Jacket"
+	item_path = /obj/item/clothing/suit/jacket/doppler/bad_for_school
+
 /*
 *	COLONIST
 */

modular_doppler/loadout_categories/categories/undersuit.dm

@@ -441,6 +441,14 @@
 	name = "Biosuit (White)"
 	item_path = /obj/item/clothing/under/underlayer/white
 
+/datum/loadout_item/undersuit/gear_harness_visible
+	name = "Gear Harness (Visible)"
+	item_path = /obj/item/clothing/under/misc/gear_harness/visible
+
+/datum/loadout_item/undersuit/shortalls
+	name = "Short Overalls"
+	item_path = /obj/item/clothing/under/shortalls
+
 // Man in suit gif
 
 /datum/loadout_item/undersuit/detective_suit

modular_doppler/modular_cosmetics/GAGS/greyscale_configs_shoes.dm

@@ -39,6 +39,19 @@
 	name = "Casual Shoes (Worn, Digi)"
 	icon_file = 'modular_doppler/modular_cosmetics/icons/mob/shoes/casual_digi.dmi'
 
+/datum/greyscale_config/geowpn
+	name = "GEOWPNS"
+	icon_file = 'modular_doppler/modular_cosmetics/icons/obj/shoes/casual.dmi'
+	json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/shoes/geowpns.json'
+
+/datum/greyscale_config/geowpn/worn
+	name = "GEOWPNS (Worn)"
+	icon_file = 'modular_doppler/modular_cosmetics/icons/mob/shoes/casual.dmi'
+
+/datum/greyscale_config/geowpn/digi
+	name = "GEOWPNS (Worn, Digi)"
+	icon_file = 'modular_doppler/modular_cosmetics/icons/mob/shoes/casual_digi.dmi'
+
 // FANCY BOOTS
 
 /datum/greyscale_config/boots

modular_doppler/modular_cosmetics/GAGS/greyscale_configs_suit.dm

@@ -123,6 +123,15 @@
 /datum/greyscale_config/twee_hoodie_hood/worn
 	name = "Twee Hoodie Hood (Worn)"
 
+/datum/greyscale_config/bad_for_school
+	name = "Bad for School Jacket"
+	icon_file = 'modular_doppler/modular_cosmetics/icons/obj/suit/jacket.dmi'
+	json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/bad_for_school_jacket.json'
+
+/datum/greyscale_config/bad_for_school/worn
+	name = "Bad for School Jacket (Worn)"
+	icon_file = 'modular_doppler/modular_cosmetics/icons/mob/suit/jacket.dmi'
+
 // Apron
 
 /datum/greyscale_config/apron

modular_doppler/modular_cosmetics/GAGS/greyscale_configs_under.dm

@@ -238,6 +238,19 @@
 	name = "Shorts (Worn, Digi)"
 	icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/pants_digi.dmi'
 
+/datum/greyscale_config/shortalls
+	name = "Shortalls"
+	icon_file = 'modular_doppler/modular_cosmetics/icons/obj/under/pants.dmi'
+	json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/under/shortalls.json'
+
+/datum/greyscale_config/shortalls/worn
+	name = "Shortalls (Worn)"
+	icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/pants.dmi'
+
+/datum/greyscale_config/shortalls/worn/digi
+	name = "Shortalls (Worn, Digi)"
+	icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/pants_digi.dmi'
+
 
 //these two jeans configs are loadbearing. they are overrides of existing tg configs, and if you remove them absolutely nothing will change in the game
 // itself, but the antag screenshot unit test will fail consistently.
@@ -284,6 +297,19 @@
 	name = "Camo Pants (Worn, Digi)"
 	icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/pants_digi.dmi'
 
+/datum/greyscale_config/moto_leggings
+	name = "Moto Leggings"
+	icon_file = 'modular_doppler/modular_cosmetics/icons/obj/under/miscellania.dmi'
+	json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/under/moto_leggings.json'
+
+/datum/greyscale_config/moto_leggings/worn
+	name = "Moto Leggings (Worn)"
+	icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/miscellania.dmi'
+
+/datum/greyscale_config/moto_leggings/worn/digi
+	name = "Moto Leggings (Worn, Digi)"
+	icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/pants_digi.dmi'
+
 /datum/greyscale_config/track_pants
 	name = "Track Pants"
 	icon_file = 'modular_doppler/modular_cosmetics/icons/obj/under/pants.dmi'
@@ -401,3 +427,12 @@
 /datum/greyscale_config/athletas_bodysuit/worn
 	name = "ATHLETAS bodysuit (Worn)"
 	icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/miscellania.dmi'
+
+/datum/greyscale_config/gear_harness_visible
+	name = "Gear Harness, Visible"
+	icon_file = 'modular_doppler/modular_cosmetics/icons/obj/under/miscellania.dmi'
+	json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/under/gear_harness_visible.json'
+
+/datum/greyscale_config/gear_harness_visible/worn
+	name = "Gear Harness, Visible (Worn)"
+	icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/miscellania.dmi'

modular_doppler/modular_cosmetics/GAGS/json_configs/shoes/geowpns.json

@@ -0,0 +1,22 @@
+{
+	"geowpn": [
+		{
+			"type": "icon_state",
+			"icon_state": "geowpn",
+			"blend_mode": "overlay",
+			"color_ids": [1]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "geowpn_swoop",
+			"blend_mode": "overlay",
+			"color_ids": [2]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "geowpn_sole",
+			"blend_mode": "overlay",
+			"color_ids": [3]
+		}
+	]
+}

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

@@ -0,0 +1,54 @@
+{
+	"bad_for_school": [
+		{
+			"type": "icon_state",
+			"icon_state": "bad_for_school_jacket",
+			"blend_mode": "overlay",
+			"color_ids": [1]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "bad_for_school_patch",
+			"blend_mode": "overlay",
+			"color_ids": [2]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "bad_for_school_bottom",
+			"blend_mode": "overlay",
+			"color_ids": [3]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "bad_for_school_top",
+			"blend_mode": "overlay",
+			"color_ids": [4]
+		}
+	],
+	"bad_for_school_t": [
+		{
+			"type": "icon_state",
+			"icon_state": "bad_for_school_jacket_t",
+			"blend_mode": "overlay",
+			"color_ids": [1]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "bad_for_school_patch_t",
+			"blend_mode": "overlay",
+			"color_ids": [2]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "bad_for_school_bottom",
+			"blend_mode": "overlay",
+			"color_ids": [3]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "bad_for_school_top",
+			"blend_mode": "overlay",
+			"color_ids": [4]
+		}
+	]
+}

modular_doppler/modular_cosmetics/GAGS/json_configs/under/gear_harness_visible.json

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

modular_doppler/modular_cosmetics/GAGS/json_configs/under/moto_leggings.json

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

modular_doppler/modular_cosmetics/GAGS/json_configs/under/shortalls.json

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

modular_doppler/modular_cosmetics/code/shoes/gags_shoes.dm

@@ -95,3 +95,27 @@
 	greyscale_config_worn_bodyshapes["[BODYSHAPE_HUMANOID]"] = /datum/greyscale_config/boots/worn
 	greyscale_config_worn_bodyshapes["[BODYSHAPE_DIGITIGRADE]"] = /datum/greyscale_config/boots/worn/digi
 	set_greyscale(colors = greyscale_colors)
+
+/obj/item/clothing/shoes/geowpn
+	name = "'GEOWPN' designer sneakers"
+	desc = "A pair of designer high tops that come much coveted amongst introverted fashion bloggers, underground Marsian ravers, bourgeoisie poseurs, and \
+	innumerable subcultural phenotypes between. The leather uppers are admittedly pretty nice."
+	icon = 'icons/map_icons/clothing/shoes.dmi'
+	worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/shoes/casual.dmi'
+	icon_state = "/obj/item/clothing/shoes/geowpns"
+	post_init_icon_state = "geowpn"
+	greyscale_config = /datum/greyscale_config/geowpn
+	greyscale_config_worn = /datum/greyscale_config/geowpn/worn
+	greyscale_config_worn_bodyshapes = list(
+		BODYSHAPE_HUMANOID_T = /datum/greyscale_config/geowpn/worn,
+		BODYSHAPE_DIGITIGRADE_T = /datum/greyscale_config/geowpn/digi,
+	)
+	greyscale_colors = "#e8dccf#292929#cfdbe8"
+	flags_1 = IS_PLAYER_COLORABLE_1
+
+/obj/item/clothing/shoes/geowpn/Initialize(mapload)
+	. = ..()
+	greyscale_config_worn_bodyshapes = list()
+	greyscale_config_worn_bodyshapes["[BODYSHAPE_HUMANOID]"] = /datum/greyscale_config/geowpn/worn
+	greyscale_config_worn_bodyshapes["[BODYSHAPE_DIGITIGRADE]"] = /datum/greyscale_config/geowpn/digi
+	set_greyscale(colors = greyscale_colors)

modular_doppler/modular_cosmetics/code/suits/jacket.dm

@@ -247,6 +247,25 @@
 	icon_state = "gacket"
 	worn_icon_state = "gacket"
 
+/obj/item/clothing/suit/jacket/doppler/bad_for_school
+	name = "'Bad for School' jacket"
+	desc = "An oversized moto jacket of thick and protective synthhide. Padded double-layer patches guard the shoulders and elbows, \
+	and a patch on the back expresses disdain for conformity."
+	icon = 'icons/map_icons/clothing/suit/_suit.dmi'
+	icon_state = "/obj/item/clothing/suit/jacket/doppler/bad_for_school"
+	post_init_icon_state = "bad_for_school"
+	greyscale_config = /datum/greyscale_config/bad_for_school
+	greyscale_config_worn = /datum/greyscale_config/bad_for_school/worn
+	greyscale_colors = "#872c2c#780a0a#a06262#3399ff"
+	flags_1 = IS_PLAYER_COLORABLE_1
+	body_parts_covered = CHEST|ARMS
+	cold_protection = CHEST|ARMS
+	min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
+
+/obj/item/clothing/suit/jacket/doppler/bad_for_school/Initialize(mapload)
+	. = ..()
+	AddComponent(/datum/component/toggle_icon, "zipper")
+
 /////////
 //COATS//
 /////////

modular_doppler/modular_cosmetics/code/under/miscellania.dm

@@ -21,13 +21,20 @@
 	can_adjust = FALSE
 
 /obj/item/clothing/under/pants/moto_leggings
-	name = "'Naka' moto leggings"
+	name = "moto leggings"
 	desc = "Lab grown lambskin has been adhered to a spandex underlayer to produce a leather with considerable \
 	four way stretch, allowing for a closer fit in leather pants than ever before. This style features integrated \
-	kneepads to boot. It's not recommended to use these for motorsports; they are not actually very protective."
+	kneepads."
 	icon = 'modular_doppler/modular_cosmetics/icons/obj/under/miscellania.dmi'
-	icon_state = "moto_leggings"
-	worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/under/miscellania.dmi'
+	icon_state = "/obj/item/clothing/under/pants/moto_leggings"
+	post_init_icon_state = "moto_leggings"
+	greyscale_config = /datum/greyscale_config/moto_leggings
+	greyscale_config_worn_bodyshapes = list(
+		BODYSHAPE_HUMANOID_T = /datum/greyscale_config/moto_leggings/worn,
+		BODYSHAPE_DIGITIGRADE_T = /datum/greyscale_config/moto_leggings/worn/digi,
+	)
+	greyscale_colors = "#872c2c#780a0a"
+	flags_1 = IS_PLAYER_COLORABLE_1
 	body_parts_covered = GROIN|LEGS
 	can_adjust = FALSE
 
@@ -63,6 +70,17 @@
 	. = ..()
 	allowed += GLOB.colonist_suit_allowed
 
+/obj/item/clothing/under/misc/gear_harness/visible
+	desc = "A loop of leather straps and metal jump rings for attaching modular storage systems."
+	slot_flags = ITEM_SLOT_ICLOTHING | ITEM_SLOT_OCLOTHING | ITEM_SLOT_BELT
+	icon = 'icons/map_icons/clothing/under/_under.dmi'
+	icon_state = "/obj/item/clothing/under/misc/gear_harness/visible"
+	post_init_icon_state = "gear_harness_visible"
+	greyscale_config = /datum/greyscale_config/gear_harness_visible
+	greyscale_config_worn = /datum/greyscale_config/gear_harness_visible/worn
+	greyscale_colors = "#292929"
+	flags_1 = IS_PLAYER_COLORABLE_1
+
 /obj/item/clothing/under/costume/bunnysuit
 	name = "bunny suit"
 	desc = "Makes the wearer more attractive; even and especially men."

modular_doppler/modular_cosmetics/code/under/pants.dm

@@ -133,6 +133,31 @@
 	icon_state = "/obj/item/clothing/under/shorts/shorter/skirt"
 	post_init_icon_state = "skirt"
 
+/obj/item/clothing/under/shortalls
+	name = "short overalls"
+	desc = "A pair of dungarees whose legs terminate at hand length."
+	icon = 'icons/map_icons/clothing/under/_under.dmi'
+	icon_state = "/obj/item/clothing/under/shortalls"
+	post_init_icon_state = "shortalls"
+	species_exception = list(/datum/species/golem)
+	greyscale_colors = "#66ccff"
+	greyscale_config = /datum/greyscale_config/shortalls
+	greyscale_config_worn = /datum/greyscale_config/shortalls/worn
+	supported_bodyshapes = list(BODYSHAPE_HUMANOID, BODYSHAPE_DIGITIGRADE)
+	greyscale_config_worn_bodyshapes = list(
+		BODYSHAPE_HUMANOID_T = /datum/greyscale_config/shortalls/worn,
+		BODYSHAPE_DIGITIGRADE_T = /datum/greyscale_config/shortalls/worn/digi,
+	)
+	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION
+	female_sprite_flags = FEMALE_UNIFORM_NO_BREASTS
+	flags_1 = IS_PLAYER_COLORABLE_1
+	body_parts_covered = CHEST|GROIN
+	can_adjust = FALSE
+
+/obj/item/clothing/suit/under/shortalls/Initialize(mapload)
+	. = ..()
+	AddComponent(/datum/component/adjust_fishing_difficulty, -4)
+
 /obj/item/clothing/under/dress/skirt/medium
 	name = "medium skirt"
 	desc = "An appealing medium-length skirt. Top not included."

modular_doppler/modular_vending/code/tg_vendors/clothesmate.dm

@@ -54,6 +54,7 @@
 				/obj/item/clothing/under/shorts/shorter/jeans/shortest = 5,
 				/obj/item/clothing/under/cowl_neck_shirt = 5,
 				/obj/item/clothing/under/collared_shirt = 5,
+				/obj/item/clothing/under/shortalls = 5,
 			),
 		),
 
@@ -127,6 +128,7 @@
 				/obj/item/clothing/under/costume/kimono/greyscale = 5,
 				/obj/item/clothing/under/costume/yukata/greyscale = 5,
 				/obj/item/clothing/under/misc/gear_harness = 5,
+				/obj/item/clothing/under/misc/gear_harness/visible = 5,
 				/obj/item/clothing/under/bodysuit = 5,
 				/obj/item/clothing/under/athletas_bodysuit = 5,
 			)
@@ -136,4 +138,6 @@
 	premium_doppler = list( //being here means you're artificially rare, congratulations
 		/obj/item/clothing/suit/toggle/labcoat/lalunevest = 3,
 		/obj/item/clothing/gloves/lalune_long = 3,
+		/obj/item/clothing/suit/jacket/doppler/bad_for_school = 3,
+		/obj/item/clothing/shoes/geowpn = 3,
 	)