From 3bf1881cc370c5bcac86fd529fc5dc64b53f7d5d Mon Sep 17 00:00:00 2001
From: Paxilmaniac <82386923+Paxilmaniac@users.noreply.github.com>
Date: Tue, 7 Feb 2023 21:14:15 -0500
Subject: [PATCH] Gives assault ops a proper antag prefs icon, one that isn't
 just the goldeneye disk (#19161)

* this is gonna look so cool

* oops

* ok that didnt quite work

* maybe we can keep the disk in the preview

* oh right dont give the previews ids

* yeah it really hates belt modsuits doesnt it

* updates the screenshot test
---
 ...creenshot_antag_icons_assaultoperative.png | Bin 622 -> 1733 bytes
 .../code/assault_operatives.dm                |  19 ++++++++++++++--
 .../code/assault_operatives_outfits.dm        |  21 ++++++++++++++----
 3 files changed, 34 insertions(+), 6 deletions(-)

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 5e9e75b9c382ce0aee315b6dbb48f9c89d0d14e7..06ef0119d1c55829fca24a6fe133b858fdea2e7c 100644
GIT binary patch
delta 1680
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
M=e&25S5)@@0fSN;x&QzG

delta 561
zcmV-10?z%#4ekVx8Gi!+007lShYA1y0A^53R7C&)07z0|h@-r?%-G!O?v`kX<+s;{
zSa@D>j$>nEC@eg{kg4al(1=)ZYlNt+xHOmT%DF`y|KPX$rEu|NADoNZ%f0`a*8jCv
z108?EZCtGAiZ;;EgMM%j#<*CMltyuKBt}PK+&TA-00001bPQ5XQvg8b*k%9#0A!IR
zGk*YbEX}w$Gg33tGfE(w;*!LYR3KAHiHkEOv#1!zH00t;D@x2wg|L+sT>V_YCISGS
z$rvAshC*oo00BlxL_t(&f$f;vQiCuQMT=Smsi0iERZ;){C*3iJIVXS@Fnxi&UYNAa
zS~JZM((ZPI5JCtcglvx_G7QWN;Ds}A9)Ahv3L6ak7)ZQ5mfS?7vBto~VvI!Z1_tH^
zCf9rKxdc~0hLbDX%hNQ?vTT(BjII??<(>n$0Wy>~&Brmh4-`d#1_KKNvd#A9vMg@_
zE`xyS=+4YQw1BRxG|Ibxd=%MKU?19nQ&v?~16-=6X$FzDZQU#eVg(K%P}QDBk$<(m
z2M@|-0&X{WR3tFAgD3E;Fc2$Hk8rL){6*_Aw}T154l4t30!L3M&nJ<9oM4j4)AcF>
zvR#Y#sPkXIE9koJ4TN&DT|2)05y-$_0^?)LuYvH`vW<W_{3`AN`VJ5neEH$wmx2EU
zK)M(sVPHn!1DxhRJBZg2aL>2cb{Y@FCl7oAs#38!&PG0+00000NkvXXu0mjf<5v5@

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