Skip to content

Commit

Permalink
Rework bloodfledge ID
Browse files Browse the repository at this point in the history
- 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"
  • Loading branch information
LeDrascol committed Nov 10, 2024
1 parent 7f161bc commit 60176a4
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
19 changes: 19 additions & 0 deletions modular_zzplurt/code/datums/id_trim/quirks.dm
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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()
Expand Down
15 changes: 12 additions & 3 deletions modular_zzplurt/code/game/objects/items/cards_ids.dm
Original file line number Diff line number Diff line change
@@ -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
Binary file modified modular_zzplurt/icons/obj/card.dmi
Binary file not shown.
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -9400,6 +9400,7 @@
#include "modular_zzplurt\code\datums\elements\headpat.dm"
#include "modular_zzplurt\code\datums\elements\holder_micro.dm"
#include "modular_zzplurt\code\datums\elements\mob_holder.dm"
#include "modular_zzplurt\code\datums\id_trim\quirks.dm"
#include "modular_zzplurt\code\datums\keybinding\human.dm"
#include "modular_zzplurt\code\datums\keybinding\living.dm"
#include "modular_zzplurt\code\datums\mutations\body.dm"
Expand Down

0 comments on commit 60176a4

Please sign in to comment.