Skip to content

Commit a1fe1be

Browse files
authored
Preview icons for antags (#6333)
1 parent 2e52408 commit a1fe1be

File tree

7 files changed

+17
-9
lines changed

7 files changed

+17
-9
lines changed

code/modules/client/preferences/middleware/antags.dm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@
125125
ROLE_SLASHER = /datum/antagonist/slasher,
126126
ROLE_FLORIDA_MAN = /datum/antagonist/florida_man,
127127
ROLE_TERATOMA = /datum/antagonist/teratoma,
128+
ROLE_ASSAULT_OPERATIVE = /datum/antagonist/assault_operative,
129+
ROLE_PLAGUERAT = /datum/antagonist/plague_rat,
128130
// monkestation end
129131
)
130132

code/modules/mod/mod_types.dm

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -573,4 +573,7 @@
573573
/obj/item/mod/control/pre_equipped/empty/ninja
574574
theme = /datum/mod_theme/ninja
575575

576+
/obj/item/mod/control/pre_equipped/empty/covert // Monkestation addition: This is where the initializition lives
577+
theme = /datum/mod_theme/covert
578+
576579
INITIALIZE_IMMEDIATE(/obj/item/mod/control/pre_equipped/empty)
Loading
Loading

monkestation/code/modules/assault_ops/code/antagonist.dm

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
preview_outfit = /datum/outfit/assaultops_preview
1717
/// In the preview icon, the operatives who are behind the leader
18-
var/preview_outfit_behind = /datum/outfit/assaultops_preview/background
18+
var/preview_outfit_behind = /datum/outfit/assaultops_preview_background
1919

2020
ui_name = "AntagInfoAssaultops"
2121
/// The default outfit given BEFORE they choose their equipment.
@@ -190,15 +190,14 @@
190190

191191
if (!isnull(preview_outfit_behind))
192192
var/icon/teammate = render_preview_outfit(preview_outfit_behind)
193-
teammate.Blend(rgb(128, 128, 128, 128), ICON_MULTIPLY)
193+
teammate.Blend(rgb(128, 128, 128, 222), ICON_MULTIPLY)
194194

195195
final_icon.Blend(teammate, ICON_UNDERLAY, -world.icon_size / 4, 0)
196196
final_icon.Blend(teammate, ICON_UNDERLAY, world.icon_size / 4, 0)
197197

198198
var/icon/disky = icon('monkestation/code/modules/assault_ops/icons/goldeneye.dmi', "goldeneye_key")
199-
disky.Shift(SOUTH, 12)
200-
final_icon.Blend(disky, ICON_OVERLAY)
201-
199+
disky.Shift(NORTH, 6)
200+
final_icon.Blend(disky, ICON_UNDERLAY)
202201
return finish_preview_icon(final_icon)
203202

204203
/datum/antagonist/assault_operative/proc/on_goldeneye_key_created(datum/source, obj/item/goldeneye_key/key)

monkestation/code/modules/assault_ops/code/outfits.dm

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,14 @@
3434
/datum/outfit/assaultops_preview
3535
name = "Assault Ops - Preview ONLY"
3636

37+
back = /obj/item/mod/control/pre_equipped/empty/covert
38+
39+
/datum/outfit/assaultops_preview_background
40+
name = "Assault Ops - Background Dudes - Preview ONLY"
41+
3742
uniform = /obj/item/clothing/under/syndicate/sniper
3843
shoes = /obj/item/clothing/shoes/jackboots
3944
gloves = /obj/item/clothing/gloves/combat
4045
ears = /obj/item/radio/headset/syndicate/alt
4146
glasses = /obj/item/clothing/glasses/sunglasses
42-
43-
/datum/outfit/assaultops_preview/background
44-
name = "Assault Ops - Background Dudes - Preview ONLY"
45-
4647
mask = /obj/item/clothing/mask/gas/sechailer/syndicate

monkestation/code/modules/virology/disease/plague_rat/antagonist.dm

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
var/datum/disease/acute/bacteria/plague
1414
var/turf/invasion
1515

16+
/datum/antagonist/plague_rat/get_preview_icon()
17+
return finish_preview_icon(icon('monkestation/code/modules/virology/icons/animal.dmi', "mouse_plague"))
18+
1619
/datum/antagonist/plague_rat/on_gain()
1720
if(!rats_rats_we_are_the_rats)
1821
rats_rats_we_are_the_rats = new

0 commit comments

Comments
 (0)