From b6b2dc66d493079aea7bfb35ab66c4657e63c192 Mon Sep 17 00:00:00 2001 From: Darius <5933805+LeDrascol@users.noreply.github.com> Date: Sun, 10 Nov 2024 20:16:36 -0500 Subject: [PATCH] Add more quirk ID cards Adds quirk ID cards and trims for Concubus, Gargoyle, Hallowed, Rad Fiend, and Werewolf. Also updates the bloodfledge overlay to be red. --- modular_zzplurt/code/datums/id_trim/quirks.dm | 48 +++++++++++++++--- .../code/game/objects/items/cards_ids.dm | 25 +++++++++ modular_zzplurt/icons/obj/card.dmi | Bin 3811 -> 3792 bytes 3 files changed, 67 insertions(+), 6 deletions(-) diff --git a/modular_zzplurt/code/datums/id_trim/quirks.dm b/modular_zzplurt/code/datums/id_trim/quirks.dm index 3806a2a0ac4ca..abf790eaabf07 100644 --- a/modular_zzplurt/code/datums/id_trim/quirks.dm +++ b/modular_zzplurt/code/datums/id_trim/quirks.dm @@ -5,15 +5,51 @@ 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 + intern_alt_name = "Quirky" + department_color = COLOR_WEBSAFE_DARK_GRAY + subdepartment_color = "#00000000" // Disabled // 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" + trim_state = "trim_droplet_red" + department_color = "#00000000" // Disabled because of custom sprite assignment = "Bloodsucker Fledgling" intern_alt_name = "Fledgling" threat_modifier = 2 // Equal to dress code violation + +// Quirk: Concubus +/datum/id_trim/quirk/concubus + trim_state = "trim_droplet" + assignment = "Concubus" + intern_alt_name = "Imp" + subdepartment_color = COLOR_BUBBLEGUM_RED + +// Quirk: Gargoyle +/datum/id_trim/quirk/gargoyle + trim_state = "trim_rectangle" + assignment = "Gargoyle" + intern_alt_name = "Statuette" + subdepartment_color = "#918E85" // Named "Stone Grey" + +// Quirk: Hallowed +/datum/id_trim/quirk/hallowed + trim_state = "trim_cleric" + assignment = "Deacon" + intern_alt_name = "Probationer" + subdepartment_color = LIGHT_COLOR_HOLY_MAGIC + threat_modifier = -1 // Equal to mind shield + +// Quirk: Rad Fiend +/datum/id_trim/quirk/rad_fiend + trim_state = "trim_rad" + assignment = "Rad Fiend" + intern_alt_name = "Radspawn" + subdepartment_color = "#14FF67" // Matches radiation outline + +// Quirk: Werewolf +/datum/id_trim/quirk/werewolf + trim_state = "trim_moon" + assignment = "Werewolf" + intern_alt_name = "Puppy" + subdepartment_color = "#F6F1D5" // Named "Moon Color" + threat_modifier = 2 // Equal to dress code violation diff --git a/modular_zzplurt/code/game/objects/items/cards_ids.dm b/modular_zzplurt/code/game/objects/items/cards_ids.dm index ab79864f0055b..d7062bf403466 100644 --- a/modular_zzplurt/code/game/objects/items/cards_ids.dm +++ b/modular_zzplurt/code/game/objects/items/cards_ids.dm @@ -13,3 +13,28 @@ icon_state = "card_bloodfledge" assignment = "Bloodsucker Fledgling" trim = /datum/id_trim/quirk/bloodfledge + +// Quirk: Concubus +/obj/item/card/id/advanced/quirk/concubus + name = "concubus identification card" + trim = /datum/id_trim/quirk/concubus + +// Quirk: Gargoyle +/obj/item/card/id/advanced/quirk/gargoyle + name = "gargoyle identification card" + trim = /datum/id_trim/quirk/gargoyle + +// Quirk: Hallowed +/obj/item/card/id/advanced/quirk/hallowed + name = "deacon identification card" + trim = /datum/id_trim/quirk/hallowed + +// Quirk: Rad Fiend +/obj/item/card/id/advanced/quirk/rad_fiend + name = "rad fiend identification card" + trim = /datum/id_trim/quirk/rad_fiend + +// Quirk: Werewolf +/obj/item/card/id/advanced/quirk/werewolf + name = "werewolf identification card" + trim = /datum/id_trim/quirk/werewolf diff --git a/modular_zzplurt/icons/obj/card.dmi b/modular_zzplurt/icons/obj/card.dmi index f62249222b0cf8a6dbe7aec508d39ac3e1a6c45b..d3432696e42e02c7433c79f6aac0468011c0e297 100644 GIT binary patch literal 3792 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 literal 3811 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