From 60176a4c95334c05a5f54a63573349dd15aeba9b Mon Sep 17 00:00:00 2001 From: Darius <5933805+LeDrascol@users.noreply.github.com> Date: Sun, 10 Nov 2024 18:44:51 -0500 Subject: [PATCH] Rework bloodfledge ID - Add quirk ID type - Add quirk ID trim type - Add fallback ID card sprite - Add fallback ID card trim - Add new bloodfledge ID sprite - Update bloodfledge ID to use advanced type - Changed ID role from "-sucker Fledgling" to "-fledge" --- .../datums/components/crafting/equipment.dm | 2 +- modular_zzplurt/code/datums/id_trim/quirks.dm | 19 ++++++++++++++++++ .../quirks/positive_quirks/bloodfledge.dm | 7 ++++--- .../code/game/objects/items/cards_ids.dm | 15 +++++++++++--- modular_zzplurt/icons/obj/card.dmi | Bin 2461 -> 3811 bytes tgstation.dme | 1 + 6 files changed, 37 insertions(+), 7 deletions(-) create mode 100644 modular_zzplurt/code/datums/id_trim/quirks.dm diff --git a/modular_zzplurt/code/datums/components/crafting/equipment.dm b/modular_zzplurt/code/datums/components/crafting/equipment.dm index 368548ba3092a..9e0e27dfac02a 100644 --- a/modular_zzplurt/code/datums/components/crafting/equipment.dm +++ b/modular_zzplurt/code/datums/components/crafting/equipment.dm @@ -3,7 +3,7 @@ name = "Hemorrhagic Sanguinizer" desc = "A modified Bloodfledge ID card capable of channeling technopathic blood magic." reqs = list( - /obj/item/card/id/vampire = 1, + /obj/item/card/id/advanced/quirk/bloodfledge = 1, /obj/item/assembly/signaler = 1, /obj/item/reagent_containers/syringe = 1, /obj/item/reagent_containers/blood = 1, diff --git a/modular_zzplurt/code/datums/id_trim/quirks.dm b/modular_zzplurt/code/datums/id_trim/quirks.dm new file mode 100644 index 0000000000000..3806a2a0ac4ca --- /dev/null +++ b/modular_zzplurt/code/datums/id_trim/quirks.dm @@ -0,0 +1,19 @@ +// This file contains all the trims associated with quirks. + +// Base entry +/datum/id_trim/quirk + trim_icon = 'modular_zzplurt/icons/obj/card.dmi' + trim_state = "trim_question" + assignment = "Error Reporter" + department_color = COLOR_NEARLY_ALL_BLACK + subdepartment_color = COLOR_NEARLY_ALL_BLACK + +// Quirk: Bloodsucker Fledgling +/datum/id_trim/quirk/bloodfledge + trim_state = "trim_bloodfledge" + // Colors disabled because Bloodfledge ID has a custom sprite + department_color = "#00000000" + subdepartment_color = "#00000000" + assignment = "Bloodsucker Fledgling" + intern_alt_name = "Fledgling" + threat_modifier = 2 // Equal to dress code violation diff --git a/modular_zzplurt/code/datums/quirks/positive_quirks/bloodfledge.dm b/modular_zzplurt/code/datums/quirks/positive_quirks/bloodfledge.dm index dbfd2debbd469..9f2771c84abaf 100644 --- a/modular_zzplurt/code/datums/quirks/positive_quirks/bloodfledge.dm +++ b/modular_zzplurt/code/datums/quirks/positive_quirks/bloodfledge.dm @@ -165,7 +165,7 @@ var/mob/living/carbon/human/quirk_mob = quirk_holder // Create vampire ID card - var/obj/item/card/id/vampire/id_vampire = new(get_turf(quirk_mob)) + var/obj/item/card/id/advanced/quirk/bloodfledge/id_vampire = new(get_turf(quirk_mob)) // Define default card type name var/card_name_type = "Blood" @@ -194,8 +194,9 @@ if(quirk_mob.chrono_age) id_vampire.registered_age = quirk_mob.chrono_age - // Set assignment - id_vampire.assignment = "[card_name_type]sucker Fledgling" + // Set assignment overrides + id_vampire.assignment = "[card_name_type]fledge" + id_vampire.trim?.assignment = "[card_name_type]fledge" // Update label id_vampire.update_label() diff --git a/modular_zzplurt/code/game/objects/items/cards_ids.dm b/modular_zzplurt/code/game/objects/items/cards_ids.dm index a404b9e7768bd..ab79864f0055b 100644 --- a/modular_zzplurt/code/game/objects/items/cards_ids.dm +++ b/modular_zzplurt/code/game/objects/items/cards_ids.dm @@ -1,6 +1,15 @@ -/obj/item/card/id/vampire - name = "Bloodfledge ID" +// Base quirk ID card +/obj/item/card/id/advanced/quirk + name = "quirky ID card" + desc = "Show this to a coder to indicate something went wrong." + assignment = "Error Reporter" + trim = /datum/id_trim/quirk + +// Quirk: Bloodsucker Fledgling +/obj/item/card/id/advanced/quirk/bloodfledge + name = "bloodfledge identification card" desc = "An ID made to easily recognize sanguine crew members without requiring medical scans." icon = 'modular_zzplurt/icons/obj/card.dmi' - icon_state = "vampire" + icon_state = "card_bloodfledge" assignment = "Bloodsucker Fledgling" + trim = /datum/id_trim/quirk/bloodfledge diff --git a/modular_zzplurt/icons/obj/card.dmi b/modular_zzplurt/icons/obj/card.dmi index 45b073437f0c094075eebacd1d33453f98a7d44b..f62249222b0cf8a6dbe7aec508d39ac3e1a6c45b 100644 GIT binary patch literal 3811 zcma)9cTf|~woU{EQ9u+yYG^;{(u7D2DAKDSEkJ~*fb@<)LQzl@f>fmj6bMBKC3FZy zQ0Yn$q=q6LK_HZngqz>o_h#O^^WL5N$L=?~v$N-%Z_j>bH_psNmzjy12><{v>+5OX zqhaLVjqx0<|D@s6M+1DQrA>hLBY(J`n@@n7w-*2qlASg<#MCK!@!XF83A+|ni24aC zQ!S|KffdM!gXTH7WEqEtu|_+liZ?DjgB{7gxPz3E_}Y6rk^RaGmW!L|lI33U!_iS& zI%Vk%ZojyaZ3Jayv)p2MuUxZn4~+XU;vW(9os=tVtnwN5XzRA7ch-;(_G)rXuxzDc z%Q6B{$7Wi40Vsp2%&54t?#XVNV>EnoG{QA*^OU45bTSf{C&Jt09m?`FP0Nad1T@uq zv7q_!3o|W3g1)wvWk~i`4#I
{2gyTGds%K@yekQ