diff --git a/modular_darkpack/master_files/icons/mob/human/human_face.dmi b/modular_darkpack/master_files/icons/mob/human/human_face.dmi index 4e9992b2ca93..cfc227514af9 100644 Binary files a/modular_darkpack/master_files/icons/mob/human/human_face.dmi and b/modular_darkpack/master_files/icons/mob/human/human_face.dmi differ diff --git a/modular_darkpack/modules/ashtray/code/ashtray.dm b/modular_darkpack/modules/ashtray/code/ashtray.dm index c7c9efff1799..41238a83be89 100644 --- a/modular_darkpack/modules/ashtray/code/ashtray.dm +++ b/modular_darkpack/modules/ashtray/code/ashtray.dm @@ -74,10 +74,6 @@ /datum/storage/ashtray max_slots = 16 max_specific_storage = WEIGHT_CLASS_TINY - // grid_width = 1 GRID_BOXES // DARKPACK TODO - GRIDVENTORY - // grid_height = 1 GRID_BOXES - // storage_max_columns = 4 - // storage_max_rows = 4 /datum/storage/ashtray/New(atom/parent, max_slots, max_specific_storage, max_total_storage, rustle_sound, remove_rustle_sound) . = ..() diff --git a/modular_darkpack/modules/clothes/code/belt.dm b/modular_darkpack/modules/clothes/code/belt.dm index 5c740b985876..a2c1cfb7ca4d 100644 --- a/modular_darkpack/modules/clothes/code/belt.dm +++ b/modular_darkpack/modules/clothes/code/belt.dm @@ -1,5 +1,5 @@ /datum/storage/holster/darkpack - max_slots = 3 // Pistol + two mags // TODO: Gridventory + max_slots = 3 // Pistol + two mags max_total_storage = 16 open_sound = 'sound/items/handling/holster_open.ogg' open_sound_vary = TRUE diff --git a/modular_darkpack/modules/splats/code/subsplat/_subsplat.dm b/modular_darkpack/modules/splats/code/subsplat/_subsplat.dm index ae7cd787c9b7..c14d9f5ebe66 100644 --- a/modular_darkpack/modules/splats/code/subsplat/_subsplat.dm +++ b/modular_darkpack/modules/splats/code/subsplat/_subsplat.dm @@ -38,6 +38,8 @@ */ /datum/subsplat/proc/on_lose(mob/living/carbon/human/losing_mob) SHOULD_CALL_PARENT(TRUE) + + UnregisterSignal(losing_mob, COMSIG_MOB_LOGIN) return diff --git a/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/kiasyd/kiasyd.dm b/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/kiasyd/kiasyd.dm index 5628f50310d5..7ca3aeb2c24c 100644 --- a/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/kiasyd/kiasyd.dm +++ b/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/kiasyd/kiasyd.dm @@ -44,6 +44,13 @@ losing_mob.add_quirk(/datum/quirk/dwarf) */ + // replace eyes + var/eye_type = /obj/item/organ/eyes + if(losing_mob.dna.species && losing_mob.dna.species.mutanteyes) + eye_type = losing_mob.dna.species.mutanteyes + var/obj/item/organ/eyes/new_eyes = new eye_type() + new_eyes.Insert(losing_mob, TRUE, DELETE_IF_REPLACED) + losing_mob.update_body() /datum/subsplat/vampire_clan/kiasyd/on_join_round(mob/living/carbon/human/joining) @@ -55,5 +62,10 @@ /obj/item/organ/eyes/kiasyd - // DARKPACK TODO - requires https://github.com/tgstation/tgstation/pull/94242 - // eye_icon_state = "kiasyd" + eye_icon = 'modular_darkpack/modules/vampire_the_masquerade/icons/human_eyes.dmi' + eye_icon_state = "kiasyd" + eye_color_left = "#FFFFFF" + eye_color_right = "#FFFFFF" + + iris_overlay = null + blink_animation = FALSE diff --git a/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/salubri.dm b/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/salubri.dm index 8a86b8c510dd..01265a1292e9 100644 --- a/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/salubri.dm +++ b/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/salubri.dm @@ -17,3 +17,25 @@ female_clothes = /obj/item/clothing/under/vampire/salubri/female enlightenment = FALSE subsplat_keys = /obj/item/vamp/keys/salubri + +/datum/subsplat/vampire_clan/salubri/on_gain(mob/living/carbon/human/gaining_mob, datum/splat/gaining_splat, joining_round) + . = ..() + + var/obj/item/organ/eyes/salubri/three_eyes = new() + three_eyes.Insert(gaining_mob, TRUE, DELETE_IF_REPLACED) + +/datum/subsplat/vampire_clan/salubri/on_lose(mob/living/carbon/human/losing_mob) + . = ..() + + // replace eyes + var/eye_type = /obj/item/organ/eyes + if(losing_mob.dna.species && losing_mob.dna.species.mutanteyes) + eye_type = losing_mob.dna.species.mutanteyes + var/obj/item/organ/eyes/new_eyes = new eye_type() + new_eyes.Insert(losing_mob, TRUE, DELETE_IF_REPLACED) + +/obj/item/organ/eyes/salubri + eye_icon = 'modular_darkpack/modules/vampire_the_masquerade/icons/human_eyes.dmi' + eye_icon_state = "salubri" + + blink_animation = FALSE diff --git a/modular_darkpack/modules/vampire_the_masquerade/icons/human_eyes.dmi b/modular_darkpack/modules/vampire_the_masquerade/icons/human_eyes.dmi new file mode 100644 index 000000000000..6089c21e249f Binary files /dev/null and b/modular_darkpack/modules/vampire_the_masquerade/icons/human_eyes.dmi differ diff --git a/modular_darkpack/modules/weapons/code/hardcase.dm b/modular_darkpack/modules/weapons/code/hardcase.dm index 3ad47d38ef51..1a9354b2b923 100644 --- a/modular_darkpack/modules/weapons/code/hardcase.dm +++ b/modular_darkpack/modules/weapons/code/hardcase.dm @@ -18,8 +18,6 @@ /datum/storage/hardcase max_slots = 4 - // screen_max_columns = 4 // DARKPACK TODO - GRIDVENTORY - // screen_max_rows = 4 // DARKPACK TODO - GRIDVENTORY /datum/storage/hardcase/New(atom/parent, max_slots, max_specific_storage, max_total_storage, rustle_sound, remove_rustle_sound) . = ..()