Skip to content

Fixes eyes for kiasyd and salubri and removes todo comments for gridventory #747

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
XeonMations merged 5 commits into from
Mar 14, 2026
Merged

Fixes eyes for kiasyd and salubri and removes todo comments for gridventory #747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1799ca3
gridventory was closed as "not planned"
lpeapnni Feb 28, 2026
d333090
kiasyd and salubri eyes
lpeapnni Feb 28, 2026
4274b84
remove more gridventory todo comments
lpeapnni Feb 28, 2026
5b9c461
moves eye sprites to different file, fixes signal shit
lpeapnni Mar 11, 2026
9437ba4
Merge branch 'master' into lkfljkf
XeonMations Mar 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified modular_darkpack/master_files/icons/mob/human/human_face.dmi
View file
Open in desktop
Binary file not shown.
4 changes: 0 additions & 4 deletions modular_darkpack/modules/ashtray/code/ashtray.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
. = ..()
Expand Down
2 changes: 1 addition & 1 deletion modular_darkpack/modules/clothes/code/belt.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions modular_darkpack/modules/splats/code/subsplat/_subsplat.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
16 changes: 14 additions & 2 deletions modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/kiasyd/kiasyd.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
22 changes: 22 additions & 0 deletions modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/salubri.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Binary file added modular_darkpack/modules/vampire_the_masquerade/icons/human_eyes.dmi
View file
Open in desktop
Binary file not shown.
2 changes: 0 additions & 2 deletions modular_darkpack/modules/weapons/code/hardcase.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
. = ..()
Expand Down
Loading