diff --git a/code/game/objects/items/stickers.dm b/code/game/objects/items/stickers.dm index eb4b20d6f17bf9..897f2306c1e87f 100644 --- a/code/game/objects/items/stickers.dm +++ b/code/game/objects/items/stickers.dm @@ -228,4 +228,3 @@ /obj/item/sticker/purity_seal/purity_seal_2 icon_state = "purity_seal_2" - diff --git a/icons/map_icons/clothing/head/_head.dmi b/icons/map_icons/clothing/head/_head.dmi index 5c9380951d7d7e..28cf761c199a5e 100644 Binary files a/icons/map_icons/clothing/head/_head.dmi and b/icons/map_icons/clothing/head/_head.dmi differ diff --git a/icons/map_icons/clothing/neck.dmi b/icons/map_icons/clothing/neck.dmi index b7d4447e70a153..511afca802bcf4 100644 Binary files a/icons/map_icons/clothing/neck.dmi and b/icons/map_icons/clothing/neck.dmi differ diff --git a/icons/map_icons/clothing/suit/_suit.dmi b/icons/map_icons/clothing/suit/_suit.dmi index daa9d70aa7a71b..f00b08ec7e955a 100644 Binary files a/icons/map_icons/clothing/suit/_suit.dmi and b/icons/map_icons/clothing/suit/_suit.dmi differ diff --git a/modular_doppler/loadout_categories/categories/neck.dm b/modular_doppler/loadout_categories/categories/neck.dm index 1af37afc6e8d6c..8319256c64b696 100644 --- a/modular_doppler/loadout_categories/categories/neck.dm +++ b/modular_doppler/loadout_categories/categories/neck.dm @@ -101,6 +101,10 @@ name = "Mantle (Teshari)" item_path = /obj/item/clothing/neck/tesharian_mantle +/datum/loadout_item/neck/cape/marsian_shoulder_cloak + name = "Marsian Shoulder Cloak" + item_path = /obj/item/clothing/neck/marsian_shoulder_cloak + /** * SCARVES */ diff --git a/modular_doppler/loadout_categories/categories/suit.dm b/modular_doppler/loadout_categories/categories/suit.dm index 5eb53d8f7ce038..1ea1506f38bcd4 100644 --- a/modular_doppler/loadout_categories/categories/suit.dm +++ b/modular_doppler/loadout_categories/categories/suit.dm @@ -334,6 +334,10 @@ name = "Peacekeeper Jacket (Security, Badged)" item_path = /obj/item/clothing/suit/jacket/doppler/peacekeeper_jacket/badged +/datum/loadout_item/suit/jacket/marsian_duster + name = "Marsian Duster" + item_path = /obj/item/clothing/suit/hooded/doppler/marsian_duster + /** * HOODIES */ @@ -369,7 +373,6 @@ name = "TechNyne Overlay" item_path = /obj/item/clothing/suit/hooded/doppler/technyne_overlay - /** * LABCOATS */ @@ -533,3 +536,11 @@ /datum/loadout_item/suit/misc/techpriest name = "Machine Dustcover" item_path = /obj/item/clothing/suit/hooded/techpriest + +/datum/loadout_item/suit/misc/marsian_gown + name = "Marsian Gown" + item_path = /obj/item/clothing/suit/hooded/doppler/marsian_gown + +/datum/loadout_item/suit/misc/marsian_overalls + name = "Marsian Overalls" + item_path = /obj/item/clothing/suit/hooded/doppler/marsian_overalls diff --git a/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_neck.dm b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_neck.dm index 831f9fc5acc00f..13c30fe1f19022 100644 --- a/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_neck.dm +++ b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_neck.dm @@ -102,6 +102,17 @@ name = "Tesharian Mantle (Worn, Teshari)" json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/neck/tesharian_mantle_worn_teshari.json' +/datum/greyscale_config/marsian_shoulder_cloak + name = "Marsian Shoulder Cloak" + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/neck.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/neck/marsian_shoulder_cloak.json' + +/datum/greyscale_config/marsian_shoulder_cloak/worn + name = "Marsian Shoulder Cloak (Worn)" + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/neck.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/neck/marsian_shoulder_cloak_worn.json' + + /////////// //SCARVES// /////////// diff --git a/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_suit.dm b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_suit.dm index a5a1e5f3a78b34..0c4fcda672c044 100644 --- a/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_suit.dm +++ b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_suit.dm @@ -196,3 +196,59 @@ name = "Fancy Suit (Worn, Teshari)" icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/suit.dmi' json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/fancy_labcoat_tesh_worn.json' + +// Marsian Fashion + +/datum/greyscale_config/marsian_duster + name = "Marsian Duster" + icon_file = 'modular_doppler/modular_cosmetics/icons/obj/suit/jacket.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_duster.json' + +/datum/greyscale_config/marsian_duster/worn + name = "Marsian Duster (Worn)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/suit/jacket.dmi' + +/datum/greyscale_config/marsian_duster_hood/ + name = "Marsian Duster Hood" + icon_file = 'modular_doppler/modular_cosmetics/icons/obj/head/hoods.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_duster_hood.json' + +/datum/greyscale_config/marsian_duster_hood/worn + name = "Marsian Duster Hood (Worn)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/head/hoods.dmi' + +/datum/greyscale_config/marsian_gown + name = "Marsian Gown" + icon_file = 'modular_doppler/modular_cosmetics/icons/obj/suit/jacket.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_gown.json' + +/datum/greyscale_config/marsian_gown/worn + name = "Marsian Gown (Worn)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/suit/jacket.dmi' + +/datum/greyscale_config/marsian_gown_hood + name = "Marsian Gown Hood" + icon_file = 'modular_doppler/modular_cosmetics/icons/obj/head/hoods.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_gown_hood.json' + +/datum/greyscale_config/marsian_gown_hood/worn + name = "Marsian Gown Hood (Worn)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/head/hoods.dmi' + +/datum/greyscale_config/marsian_overalls + name = "Marsian Overalls" + icon_file = 'modular_doppler/modular_cosmetics/icons/obj/suit/jacket.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_overalls.json' + +/datum/greyscale_config/marsian_overalls/worn + name = "Marsian Overalls (Worn)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/suit/jacket.dmi' + +/datum/greyscale_config/marsian_overalls_helmet + name = "Marsian Overalls Helmet" + icon_file = 'modular_doppler/modular_cosmetics/icons/obj/head/hoods.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_overalls_helmet.json' + +/datum/greyscale_config/marsian_overalls_helmet/worn + name = "Marsian Overalls (Worn)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/head/hoods.dmi' diff --git a/modular_doppler/modular_cosmetics/GAGS/icons/mob/neck.dmi b/modular_doppler/modular_cosmetics/GAGS/icons/mob/neck.dmi index 6ce427f8873c47..3821877cfa2070 100644 Binary files a/modular_doppler/modular_cosmetics/GAGS/icons/mob/neck.dmi and b/modular_doppler/modular_cosmetics/GAGS/icons/mob/neck.dmi differ diff --git a/modular_doppler/modular_cosmetics/GAGS/icons/obj/neck.dmi b/modular_doppler/modular_cosmetics/GAGS/icons/obj/neck.dmi index 80e4a00e006267..136eecdfa54763 100644 Binary files a/modular_doppler/modular_cosmetics/GAGS/icons/obj/neck.dmi and b/modular_doppler/modular_cosmetics/GAGS/icons/obj/neck.dmi differ diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/neck/marsian_shoulder_cloak.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/neck/marsian_shoulder_cloak.json new file mode 100644 index 00000000000000..7cb1a0287a834e --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/neck/marsian_shoulder_cloak.json @@ -0,0 +1,21 @@ +{ + "marsian_shoulder_cloak": [ + { + "type": "icon_state", + "icon_state": "marsian_shoulder_cloak", + "blend_mode": "overlay", + "color_ids": [1] + }, + { + "type": "icon_state", + "icon_state": "marsian_shoulder_cloak_trim", + "blend_mode": "overlay", + "color_ids": [2] + }, + { + "type": "icon_state", + "icon_state": "marsian_shoulder_cloak_fur", + "blend_mode": "overlay" + } + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/neck/marsian_shoulder_cloak_worn.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/neck/marsian_shoulder_cloak_worn.json new file mode 100644 index 00000000000000..7cb1a0287a834e --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/neck/marsian_shoulder_cloak_worn.json @@ -0,0 +1,21 @@ +{ + "marsian_shoulder_cloak": [ + { + "type": "icon_state", + "icon_state": "marsian_shoulder_cloak", + "blend_mode": "overlay", + "color_ids": [1] + }, + { + "type": "icon_state", + "icon_state": "marsian_shoulder_cloak_trim", + "blend_mode": "overlay", + "color_ids": [2] + }, + { + "type": "icon_state", + "icon_state": "marsian_shoulder_cloak_fur", + "blend_mode": "overlay" + } + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_duster.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_duster.json new file mode 100644 index 00000000000000..24c36c7382a856 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_duster.json @@ -0,0 +1,40 @@ +{ + "marsian_duster": [ + { + "type": "icon_state", + "icon_state": "marsian_duster_underlay", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "marsian_duster", + "blend_mode": "overlay", + "color_ids": [1] + }, + { + "type": "icon_state", + "icon_state": "marsian_duster_trim", + "blend_mode": "overlay", + "color_ids": [2] + } + ], + "marsian_duster_t": [ + { + "type": "icon_state", + "icon_state": "marsian_duster_underlay_t", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "marsian_duster_t", + "blend_mode": "overlay", + "color_ids": [1] + }, + { + "type": "icon_state", + "icon_state": "marsian_duster_trim_t", + "blend_mode": "overlay", + "color_ids": [2] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_duster_hood.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_duster_hood.json new file mode 100644 index 00000000000000..a8e8c3cd7ce2d9 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_duster_hood.json @@ -0,0 +1,21 @@ +{ + "marsian_duster_hood": [ + { + "type": "icon_state", + "icon_state": "marsian_duster_hood_underlay", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "marsian_duster_hood", + "blend_mode": "overlay", + "color_ids": [1] + }, + { + "type": "icon_state", + "icon_state": "marsian_duster_hood_trim", + "blend_mode": "overlay", + "color_ids": [2] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_gown.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_gown.json new file mode 100644 index 00000000000000..21108c86e89389 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_gown.json @@ -0,0 +1,52 @@ +{ + "marsian_gown":[ + { + "type": "icon_state", + "icon_state": "marsian_gown", + "blend_mode": "overlay", + "color_ids": [1] + }, + { + "type": "icon_state", + "icon_state": "marsian_gown_trim", + "blend_mode": "overlay", + "color_ids": [2] + }, + { + "type": "icon_state", + "icon_state": "marsian_gown_underlay", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "marsian_gown_tech", + "blend_mode": "overlay", + "color_ids": [3] + } + ], + "marsian_gown_t":[ + { + "type": "icon_state", + "icon_state": "marsian_gown_t", + "blend_mode": "overlay", + "color_ids": [1] + }, + { + "type": "icon_state", + "icon_state": "marsian_gown_trim_t", + "blend_mode": "overlay", + "color_ids": [2] + }, + { + "type": "icon_state", + "icon_state": "marsian_gown_underlay_t", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "marsian_gown_tech_t", + "blend_mode": "overlay", + "color_ids": [3] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_gown_hood.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_gown_hood.json new file mode 100644 index 00000000000000..cba9fad25008a0 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_gown_hood.json @@ -0,0 +1,27 @@ +{ + "marsian_gown_hood": [ + { + "type": "icon_state", + "icon_state": "marsian_gown_hood_underlay", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "marsian_gown_hood", + "blend_mode": "overlay", + "color_ids": [1] + }, + { + "type": "icon_state", + "icon_state": "marsian_gown_hood_trim", + "blend_mode": "overlay", + "color_ids": [2] + }, + { + "type": "icon_state", + "icon_state": "marsian_gown_hood_tech", + "blend_mode": "overlay", + "color_ids": [3] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_overalls.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_overalls.json new file mode 100644 index 00000000000000..01dd028188dc72 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_overalls.json @@ -0,0 +1,40 @@ +{ + "marsian_overalls":[ + { + "type": "icon_state", + "icon_state": "marsian_overalls", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "marsian_overalls_trim", + "blend_mode": "overlay", + "color_ids": [1] + }, + { + "type": "icon_state", + "icon_state": "marsian_overalls_tech", + "blend_mode": "overlay", + "color_ids": [2] + } + ], + "marsian_overalls_t":[ + { + "type": "icon_state", + "icon_state": "marsian_overalls_t", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "marsian_overalls_trim_t", + "blend_mode": "overlay", + "color_ids": [1] + }, + { + "type": "icon_state", + "icon_state": "marsian_overalls_tech_t", + "blend_mode": "overlay", + "color_ids": [2] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_overalls_helmet.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_overalls_helmet.json new file mode 100644 index 00000000000000..c6b7307a6db80b --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/suit/marsian_overalls_helmet.json @@ -0,0 +1,21 @@ +{ + "marsian_overalls_helmet":[ + { + "type": "icon_state", + "icon_state": "marsian_overalls_helmet", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "marsian_overalls_helmet_trim", + "blend_mode": "overlay", + "color_ids": [1] + }, + { + "type": "icon_state", + "icon_state": "marsian_overalls_helmet_tech", + "blend_mode": "overlay", + "color_ids": [2] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/code/neck/neck.dm b/modular_doppler/modular_cosmetics/code/neck/neck.dm index f82e032fd833bc..e6bf14deacabd7 100644 --- a/modular_doppler/modular_cosmetics/code/neck/neck.dm +++ b/modular_doppler/modular_cosmetics/code/neck/neck.dm @@ -125,6 +125,21 @@ greyscale_colors = "#ffcc00#ffffff" flags_1 = IS_PLAYER_COLORABLE_1 +//Marsian Fashion +/obj/item/clothing/neck/marsian_shoulder_cloak + name = "marsian shoulder cloak" + desc = "Normally thrown atop something else, this thick, fur-collared mantle cinches in the front\ + and provides a strictly aesthetic quality, most often burnished in colors\ + resembling the wearer's typical environments." + icon = 'icons/map_icons/clothing/neck.dmi' + icon_state = "/obj/item/clothing/neck/marsian_shoulder_cloak" + post_init_icon_state = "marsian_shoulder_cloak" + greyscale_config = /datum/greyscale_config/marsian_shoulder_cloak + greyscale_config_worn = /datum/greyscale_config/marsian_shoulder_cloak/worn + greyscale_colors = "#892626#ffffff" + flags_1 = IS_PLAYER_COLORABLE_1 + + /////////// //SCARVES// /////////// @@ -160,3 +175,4 @@ greyscale_config = /datum/greyscale_config/mantle greyscale_config_worn = /datum/greyscale_config/mantle/worn flags_1 = IS_PLAYER_COLORABLE_1 + diff --git a/modular_doppler/modular_cosmetics/code/suits/jacket.dm b/modular_doppler/modular_cosmetics/code/suits/jacket.dm index fe75e8688c34de..22d34961c858f1 100644 --- a/modular_doppler/modular_cosmetics/code/suits/jacket.dm +++ b/modular_doppler/modular_cosmetics/code/suits/jacket.dm @@ -561,3 +561,144 @@ greyscale_config = /datum/greyscale_config/technyne_hood/worn greyscale_config_worn = /datum/greyscale_config/technyne_hood/worn greyscale_colors = "#b66029" + +// Marsian Fashion + +/obj/item/clothing/suit/hooded/doppler/marsian_duster + name = "marsian duster" + desc = "Worn by the utilitarian, this is a bit of a throwback design-- somewhere between a duster and a hooded cloak. \ + Thick and durable canvas is smattered with the occasional abrasion of dust storm and the microscopic craters \ + it creates, but the material will likely long outlive the wearer. " + icon = 'icons/map_icons/clothing/suit/_suit.dmi' + icon_state = "/obj/item/clothing/suit/hooded/doppler/marsian_duster" + post_init_icon_state = "marsian_duster" + cold_protection = CHEST|ARMS + min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT + greyscale_config = /datum/greyscale_config/marsian_duster + greyscale_config_worn = /datum/greyscale_config/marsian_duster/worn + greyscale_colors = "#ffffff#ffffff" + flags_1 = IS_PLAYER_COLORABLE_1 + hoodtype = /obj/item/clothing/head/hooded/doppler/marsian_duster_hood + +/obj/item/clothing/suit/hooded/doppler/marsian_duster/set_greyscale(list/colors, new_config, new_worn_config, new_inhand_left, new_inhand_right) + . = ..() + if(!hood) + return + var/list/hoodie_colors = SSgreyscale.ParseColorString(greyscale_colors) + var/list/new_hoodie_colors = hoodie_colors.Copy(1) + hood.set_greyscale(new_hoodie_colors) + hood.update_slot_icon() + +/obj/item/clothing/suit/hooded/doppler/marsian_duster/on_hood_created(obj/item/clothing/head/hooded/hood) + . = ..() + var/list/hoodie_colors = (SSgreyscale.ParseColorString(greyscale_colors)) + var/list/new_hoodie_colors = hoodie_colors.Copy(1) + hood.set_greyscale(new_hoodie_colors) + +/obj/item/clothing/head/hooded/doppler/marsian_duster_hood + name = "marsian duster hood" + desc = "The hood of the Marsian duster." + icon = 'icons/map_icons/clothing/head/_head.dmi' + icon_state = "/obj/item/clothing/head/hooded/marsian_duster_hood" + post_init_icon_state = "marsian_duster_hood" + body_parts_covered = HEAD + cold_protection = HEAD + min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT + hair_mask = /datum/hair_mask/winterhood + greyscale_config = /datum/greyscale_config/marsian_duster_hood + greyscale_config_worn = /datum/greyscale_config/marsian_duster_hood/worn + greyscale_colors = "#ffffff#ffffff" + flags_1 = IS_PLAYER_COLORABLE_1 + +/obj/item/clothing/suit/hooded/doppler/marsian_gown + name = "marsian gown" + desc = "A comfortable dress, much like the standard machine dustcovers. It comes fitted with belts and loops for\ + the average Red Marsian, as eventually needing so much equipment became the standard for mechanics and the like.\ + Made with the durable material necessary to protect one from the dust storms." + icon = 'icons/map_icons/clothing/suit/_suit.dmi' + icon_state = "/obj/item/clothing/suit/hooded/doppler/marsian_gown" + post_init_icon_state = "marsian_gown" + cold_protection = CHEST|ARMS + min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT + greyscale_config = /datum/greyscale_config/marsian_gown + greyscale_config_worn = /datum/greyscale_config/marsian_gown/worn + greyscale_colors = "#ffffff#ffffff#ffffff" + flags_1 = IS_PLAYER_COLORABLE_1 + hoodtype = /obj/item/clothing/head/hooded/doppler/marsian_gown_hood + +/obj/item/clothing/suit/hooded/doppler/marsian_gown/set_greyscale(list/colors, new_config, new_worn_config, new_inhand_left, new_inhand_right) + . = ..() + if(!hood) + return + var/list/hoodie_colors = SSgreyscale.ParseColorString(greyscale_colors) + var/list/new_hoodie_colors = hoodie_colors.Copy(1) + hood.set_greyscale(new_hoodie_colors) + hood.update_slot_icon() + +/obj/item/clothing/suit/hooded/doppler/marsian_gown/on_hood_created(obj/item/clothing/head/hooded/hood) + . = ..() + var/list/hoodie_colors = (SSgreyscale.ParseColorString(greyscale_colors)) + var/list/new_hoodie_colors = hoodie_colors.Copy(1) + hood.set_greyscale(new_hoodie_colors) + +/obj/item/clothing/head/hooded/doppler/marsian_gown_hood + name = "marsian gown hood" + desc = "The hood of the Marsian gown." + icon = 'icons/map_icons/clothing/head/_head.dmi' + icon_state = "/obj/item/clothing/head/hooded/marsian_gown_hood" + post_init_icon_state = "marsian_gown_hood" + body_parts_covered = HEAD + cold_protection = HEAD + min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT + hair_mask = /datum/hair_mask/winterhood + greyscale_config = /datum/greyscale_config/marsian_gown_hood + greyscale_config_worn = /datum/greyscale_config/marsian_gown_hood/worn + greyscale_colors = "#ffffff#ffffff#ffffff" + flags_1 = IS_PLAYER_COLORABLE_1 + +/obj/item/clothing/suit/hooded/doppler/marsian_overalls + name = "marsian overalls" + desc = "A dense network of rubber tubes worm their way through this environment suit,\ + comfort control machinery underneath adding or removing temperature from the wearer's overworked body.\ + A retractile hood has been added with cameras on the outside to ensure\ + the visor can remain thick." + icon = 'icons/map_icons/clothing/suit/_suit.dmi' + icon_state = "/obj/item/clothing/suit/hooded/doppler/marsian_overalls" + post_init_icon_state = "marsian_overalls" + cold_protection = CHEST|ARMS + min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT + greyscale_config = /datum/greyscale_config/marsian_overalls + greyscale_config_worn = /datum/greyscale_config/marsian_overalls/worn + greyscale_colors = "#ffffff#ffffff" + flags_1 = IS_PLAYER_COLORABLE_1 + hoodtype = /obj/item/clothing/head/hooded/doppler/marsian_overalls_helmet + +/obj/item/clothing/suit/hooded/doppler/marsian_overalls/set_greyscale(list/colors, new_config, new_worn_config, new_inhand_left, new_inhand_right) + . = ..() + if(!hood) + return + var/list/hoodie_colors = SSgreyscale.ParseColorString(greyscale_colors) + var/list/new_hoodie_colors = hoodie_colors.Copy(1) + hood.set_greyscale(new_hoodie_colors) + hood.update_slot_icon() + +/obj/item/clothing/suit/hooded/doppler/marsian_overalls/on_hood_created(obj/item/clothing/head/hooded/hood) + . = ..() + var/list/hoodie_colors = (SSgreyscale.ParseColorString(greyscale_colors)) + var/list/new_hoodie_colors = hoodie_colors.Copy(1) + hood.set_greyscale(new_hoodie_colors) + +/obj/item/clothing/head/hooded/doppler/marsian_overalls_helmet + name = "marsian overalls helmet" + desc = "The helmet-like hood of the Marsian overalls." + icon = 'icons/map_icons/clothing/head/_head.dmi' + icon_state = "/obj/item/clothing/head/hooded/marsian_overalls_helmet" + post_init_icon_state = "marsian_overalls_helmet" + body_parts_covered = HEAD + cold_protection = HEAD + flags_inv = HIDEHAIR|HIDEEARS + min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT + greyscale_config = /datum/greyscale_config/marsian_overalls_helmet + greyscale_config_worn = /datum/greyscale_config/marsian_overalls_helmet/worn + greyscale_colors = "#ffffff#ffffff" + flags_1 = IS_PLAYER_COLORABLE_1 diff --git a/modular_doppler/modular_cosmetics/icons/mob/head/hoods.dmi b/modular_doppler/modular_cosmetics/icons/mob/head/hoods.dmi index 10574a9e02e899..07b2eebb5be675 100644 Binary files a/modular_doppler/modular_cosmetics/icons/mob/head/hoods.dmi and b/modular_doppler/modular_cosmetics/icons/mob/head/hoods.dmi differ diff --git a/modular_doppler/modular_cosmetics/icons/mob/suit/jacket.dmi b/modular_doppler/modular_cosmetics/icons/mob/suit/jacket.dmi index 24c8d70968c431..b6e6dc8c3e77ba 100644 Binary files a/modular_doppler/modular_cosmetics/icons/mob/suit/jacket.dmi and b/modular_doppler/modular_cosmetics/icons/mob/suit/jacket.dmi differ diff --git a/modular_doppler/modular_cosmetics/icons/obj/head/hoods.dmi b/modular_doppler/modular_cosmetics/icons/obj/head/hoods.dmi index 2c301fffcd74a3..d403e42f4d7b39 100644 Binary files a/modular_doppler/modular_cosmetics/icons/obj/head/hoods.dmi and b/modular_doppler/modular_cosmetics/icons/obj/head/hoods.dmi differ diff --git a/modular_doppler/modular_cosmetics/icons/obj/suit/jacket.dmi b/modular_doppler/modular_cosmetics/icons/obj/suit/jacket.dmi index e96a4cc342a9f0..712845c472df2b 100644 Binary files a/modular_doppler/modular_cosmetics/icons/obj/suit/jacket.dmi and b/modular_doppler/modular_cosmetics/icons/obj/suit/jacket.dmi differ diff --git a/modular_doppler/modular_items/code/stickers.dm b/modular_doppler/modular_items/code/stickers.dm index 677365badaf4ca..5ae6cd7b8a48d2 100644 --- a/modular_doppler/modular_items/code/stickers.dm +++ b/modular_doppler/modular_items/code/stickers.dm @@ -24,6 +24,14 @@ name = "marsian flag sticker" icon_state = "marsian" +/obj/item/sticker/doppler/marsian_seal_dark + name = "marsian seal" + icon_state = "marsian_seal_dark" + +/obj/item/sticker/doppler/marsian_seal_light + name = "marsian seal" + icon_state = "marsian_seal_light" + /obj/item/sticker/doppler/tizira name = "tiziran flag sticker" icon_state = "tizira" @@ -117,3 +125,13 @@ "rhinestone_green", ) spawned_sticker_basetype = /obj/item/sticker/rhinestone + +///box for the wax seals +/obj/item/storage/box/stickers/marsian_seals + name = "box of marsians seals" + desc = "A box containing several seals representing the rebels of Mars." + +/obj/item/storage/box/stickers/marsian_seals/PopulateContents() + for(var/i in 1 to 4) + new /obj/item/sticker/doppler/marsian_seal_dark(src) + new /obj/item/sticker/doppler/marsian_seal_light(src) diff --git a/modular_doppler/modular_items/icons/stickers.dmi b/modular_doppler/modular_items/icons/stickers.dmi index f7c3da12d46573..2d75aa8590decc 100644 Binary files a/modular_doppler/modular_items/icons/stickers.dmi and b/modular_doppler/modular_items/icons/stickers.dmi differ diff --git a/modular_doppler/modular_vending/code/tg_vendors/wardrobes.dm b/modular_doppler/modular_vending/code/tg_vendors/wardrobes.dm index 2834d2cb897ae2..a934ad3ba1711c 100644 --- a/modular_doppler/modular_vending/code/tg_vendors/wardrobes.dm +++ b/modular_doppler/modular_vending/code/tg_vendors/wardrobes.dm @@ -43,6 +43,7 @@ /obj/item/clothing/head/utility/hardhat/dblue = 2, /obj/item/clothing/head/utility/hardhat/welding/dblue = 2, /obj/item/clothing/head/utility/hardhat/red = 2, + /obj/item/storage/box/stickers/marsian_seals = 2 ) /obj/machinery/vending/wardrobe/atmos_wardrobe @@ -109,6 +110,7 @@ /obj/item/storage/backpack/custom = 2, /obj/item/storage/backpack/satchel/custom = 2, /obj/item/storage/backpack/duffelbag/custom = 2, + /obj/item/storage/box/stickers/marsian_seals = 2 ) /obj/machinery/vending/wardrobe/science_wardrobe