diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_assaultoperative.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_assaultoperative.png index 5e9e75b9c38..06ef0119d1c 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_antag_icons_assaultoperative.png and b/code/modules/unit_tests/screenshots/screenshot_antag_icons_assaultoperative.png differ diff --git a/modular_skyrat/modules/assault_operatives/code/assault_operatives.dm b/modular_skyrat/modules/assault_operatives/code/assault_operatives.dm index dd65a4d22a3..013f44e4c5c 100644 --- a/modular_skyrat/modules/assault_operatives/code/assault_operatives.dm +++ b/modular_skyrat/modules/assault_operatives/code/assault_operatives.dm @@ -11,7 +11,11 @@ antag_moodlet = /datum/mood_event/focused show_to_ghosts = TRUE hijack_speed = 2 - preview_outfit = /datum/outfit/syndicate + + preview_outfit = /datum/outfit/assaultops_preview + /// In the preview icon, the operatives who are behind the leader + var/preview_outfit_behind = /datum/outfit/assaultops_preview/background + ui_name = "AntagInfoAssaultops" /// The default outfit given BEFORE they choose their equipment. var/assault_operative_default_outfit = /datum/outfit/assaultops @@ -176,7 +180,18 @@ if (!preview_outfit) return null - var/icon/final_icon = icon('modular_skyrat/modules/assault_operatives/icons/goldeneye.dmi', "goldeneye_key") + var/icon/final_icon = render_preview_outfit(preview_outfit) + + if (!isnull(preview_outfit_behind)) + var/icon/teammate = render_preview_outfit(preview_outfit_behind) + teammate.Blend(rgb(128, 128, 128, 128), ICON_MULTIPLY) + + final_icon.Blend(teammate, ICON_UNDERLAY, -world.icon_size / 4, 0) + final_icon.Blend(teammate, ICON_UNDERLAY, world.icon_size / 4, 0) + + var/icon/disky = icon('modular_skyrat/modules/assault_operatives/icons/goldeneye.dmi', "goldeneye_key") + disky.Shift(SOUTH, 12) + final_icon.Blend(disky, ICON_OVERLAY) return finish_preview_icon(final_icon) diff --git a/modular_skyrat/modules/assault_operatives/code/assault_operatives_outfits.dm b/modular_skyrat/modules/assault_operatives/code/assault_operatives_outfits.dm index efbfb08fe33..3a63be7617b 100644 --- a/modular_skyrat/modules/assault_operatives/code/assault_operatives_outfits.dm +++ b/modular_skyrat/modules/assault_operatives/code/assault_operatives_outfits.dm @@ -1,6 +1,3 @@ - - -//KITS /datum/outfit/assaultops name = "Assault Ops - Default" @@ -9,13 +6,13 @@ gloves = /obj/item/clothing/gloves/combat back = /obj/item/storage/backpack/chameleon ears = /obj/item/radio/headset/syndicate/alt - id = /obj/item/card/id/advanced/chameleon glasses = /obj/item/clothing/glasses/sunglasses mask = /obj/item/clothing/mask/gas/sechailer/syndicate l_pocket = /obj/item/switchblade r_pocket = /obj/item/armament_points_card/assaultops + id = /obj/item/card/id/advanced/chameleon id_trim = /datum/id_trim/chameleon/operative /datum/outfit/assaultops/post_equip(mob/living/carbon/human/equipping_human) @@ -30,3 +27,19 @@ equipping_human.faction |= ROLE_SYNDICATE equipping_human.update_icons() + +// ICONS FOR PREVIEW USE ONLY + +/datum/outfit/assaultops_preview + name = "Assault Ops - Preview ONLY" + + uniform = /obj/item/clothing/under/syndicate/sniper + shoes = /obj/item/clothing/shoes/jackboots + gloves = /obj/item/clothing/gloves/combat + ears = /obj/item/radio/headset/syndicate/alt + glasses = /obj/item/clothing/glasses/sunglasses + +/datum/outfit/assaultops_preview/background + name = "Assault Ops - Background Dudes - Preview ONLY" + + mask = /obj/item/clothing/mask/gas/sechailer/syndicate