Skip to content
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

Add: Customization module and sort out accessories #918

Merged
merged 1 commit into from
Dec 27, 2024
Merged

Add: Customization module and sort out accessories #918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions code/modules/mob/living/carbon/human/human_update_icons.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,14 +393,14 @@
var/icon_file = 'icons/mob/clothing/head/default.dmi'
// BANDASTATION EDIT START - SPECIES CLOTHING ICONS
var/list/icon_files_species = list(
"vulpkanin" = 'modular_bandastation/species/icons/mob/species/clothing/head.dmi',
"vulpkanin" = 'modular_bandastation/species/icons/mob/species/vulpkanin/clothing/head.dmi',
)

var/mutant_override = FALSE

var/obj/item/bodypart/head/bodypart_head = src.get_bodypart(BODY_ZONE_HEAD)
if(worn_item.worn_icon_species && worn_item.worn_icon_species[bodypart_head.species_bodytype])

Check warning on line 402 in code/modules/mob/living/carbon/human/human_update_icons.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

OD2304: Invalid index operation. datum[] index operations are not valid starting in BYOND 515.1641
icon_file = worn_item.worn_icon_species[bodypart_head.species_bodytype]

Check warning on line 403 in code/modules/mob/living/carbon/human/human_update_icons.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

OD2304: Invalid index operation. datum[] index operations are not valid starting in BYOND 515.1641
mutant_override = TRUE
else if(bodypart_head.species_bodytype in icon_files_species)
icon_file = icon_files_species[bodypart_head.species_bodytype]
Expand Down Expand Up @@ -462,14 +462,14 @@
var/icon_file = DEFAULT_SUIT_FILE
// BANDASTATION EDIT START - SPECIES CLOTHING ICONS
var/list/icon_files_species = list(
"vulpkanin" = 'modular_bandastation/species/icons/mob/species/clothing/suit.dmi',
"vulpkanin" = 'modular_bandastation/species/icons/mob/species/vulpkanin/clothing/suit.dmi',
)

var/mutant_override = FALSE

var/obj/item/bodypart/chest/bodypart_chest = src.get_bodypart(BODY_ZONE_CHEST)
if(worn_item.worn_icon_species && worn_item.worn_icon_species[bodypart_chest.species_bodytype])

Check warning on line 471 in code/modules/mob/living/carbon/human/human_update_icons.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

OD2304: Invalid index operation. datum[] index operations are not valid starting in BYOND 515.1641
icon_file = worn_item.worn_icon_species[bodypart_chest.species_bodytype]

Check warning on line 472 in code/modules/mob/living/carbon/human/human_update_icons.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

OD2304: Invalid index operation. datum[] index operations are not valid starting in BYOND 515.1641
mutant_override = TRUE
else if(bodypart_chest.species_bodytype in icon_files_species)
icon_file = icon_files_species[bodypart_chest.species_bodytype]
Expand Down Expand Up @@ -532,14 +532,14 @@

var/icon_file = 'icons/mob/clothing/mask.dmi'
var/list/icon_files_species = list(
"vulpkanin" = 'modular_bandastation/species/icons/mob/species/clothing/mask.dmi',
"vulpkanin" = 'modular_bandastation/species/icons/mob/species/vulpkanin/clothing/mask.dmi',
)

var/mutant_override = FALSE

var/obj/item/bodypart/head/bodypart_head = src.get_bodypart(BODY_ZONE_HEAD)
if(worn_item.worn_icon_species && worn_item.worn_icon_species[bodypart_head.species_bodytype])

Check warning on line 541 in code/modules/mob/living/carbon/human/human_update_icons.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

OD2304: Invalid index operation. datum[] index operations are not valid starting in BYOND 515.1641
icon_file = worn_item.worn_icon_species[bodypart_head.species_bodytype]

Check warning on line 542 in code/modules/mob/living/carbon/human/human_update_icons.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

OD2304: Invalid index operation. datum[] index operations are not valid starting in BYOND 515.1641
mutant_override = TRUE
else if(bodypart_head.species_bodytype in icon_files_species)
icon_file = icon_files_species[bodypart_head.species_bodytype]
Expand Down
4 changes: 4 additions & 0 deletions modular_bandastation/customization/_customization.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/datum/modpack/customization
name = "Cutomization"
desc = "Кастомизация персонажей."
author = "dj-34, Dekupich"
3 changes: 3 additions & 0 deletions modular_bandastation/customization/_customization.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#include "_customization.dm"

#include "code/sprite_accessories/hair.dm"
50 changes: 25 additions & 25 deletions modular_bandastation/hair/code/hair.dm → ...omization/code/sprite_accessories/hair.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,124 +1,124 @@
/datum/sprite_accessory/hair/afropuffleft
name = "Afropuff Left"
icon = 'modular_bandastation/hair/icons/human_face.dmi'
icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi'
icon_state = "hair_afropuffleft"

/datum/sprite_accessory/hair/afropuffright
name = "Afropuff Rigt"
icon = 'modular_bandastation/hair/icons/human_face.dmi'
icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi'
icon_state = "hair_afropuffright"

/datum/sprite_accessory/hair/baum
name = "Baum"
icon = 'modular_bandastation/hair/icons/human_face.dmi'
icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi'
icon_state = "hair_baum"

/datum/sprite_accessory/hair/cotton
name = "Cotton"
icon = 'modular_bandastation/hair/icons/human_face.dmi'
icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi'
icon_state = "hair_cotton"

/datum/sprite_accessory/hair/cottonalt
name = "Cotton Alt"
icon = 'modular_bandastation/hair/icons/human_face.dmi'
icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi'
icon_state = "hair_cottonalt"

/datum/sprite_accessory/hair/flipped
name = "Flipped"
icon = 'modular_bandastation/hair/icons/human_face.dmi'
icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi'
icon_state = "hair_flipped"

/datum/sprite_accessory/hair/froofy
name = "Froofy"
icon = 'modular_bandastation/hair/icons/human_face.dmi'
icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi'
icon_state = "hair_froofy"

/datum/sprite_accessory/hair/frontbraids
name = "Long Braids"
icon = 'modular_bandastation/hair/icons/human_face.dmi'
icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi'
icon_state = "hair_frontbraids"

/datum/sprite_accessory/hair/glammetal
name = "Glammetal"
icon = 'modular_bandastation/hair/icons/human_face.dmi'
icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi'
icon_state = "hair_glammetal"

/datum/sprite_accessory/hair/inari
name = "Inari"
icon = 'modular_bandastation/hair/icons/human_face.dmi'
icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi'
icon_state = "hair_inari"

/datum/sprite_accessory/hair/kisaragi
name = "Kisaragi"
icon = 'modular_bandastation/hair/icons/human_face.dmi'
icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi'
icon_state = "hair_kisaragi"

/datum/sprite_accessory/hair/longbuns
name = "Long Buns"
icon = 'modular_bandastation/hair/icons/human_face.dmi'
icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi'
icon_state = "hair_longbuns"

/datum/sprite_accessory/hair/longstraighttwintails
name = "Long Twintails"
icon = 'modular_bandastation/hair/icons/human_face.dmi'
icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi'
icon_state = "hair_longstraighttwintails"

/datum/sprite_accessory/hair/longwavy
name = "Long Wavy"
icon = 'modular_bandastation/hair/icons/human_face.dmi'
icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi'
icon_state = "hair_longwavy"

/datum/sprite_accessory/hair/ponytail6
name = "Ponytail Strict"
icon = 'modular_bandastation/hair/icons/human_face.dmi'
icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi'
icon_state = "hair_ponytail6"

/datum/sprite_accessory/hair/quadcurls
name = "Quadcurls"
icon = 'modular_bandastation/hair/icons/human_face.dmi'
icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi'
icon_state = "hair_quadcurls"

/datum/sprite_accessory/hair/rockstar
name = "Rockstar"
icon = 'modular_bandastation/hair/icons/human_face.dmi'
icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi'
icon_state = "hair_rockstar"

/datum/sprite_accessory/hair/stacy
name = "Stacy"
icon = 'modular_bandastation/hair/icons/human_face.dmi'
icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi'
icon_state = "hair_stacy"

/datum/sprite_accessory/hair/shorttassles
name = "Short Tassles"
icon = 'modular_bandastation/hair/icons/human_face.dmi'
icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi'
icon_state = "hair_shorttassles"

/datum/sprite_accessory/hair/supernova
name = "Supernova"
icon = 'modular_bandastation/hair/icons/human_face.dmi'
icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi'
icon_state = "hair_supernova"

/datum/sprite_accessory/hair/tribum
name = "Tri-bun"
icon = 'modular_bandastation/hair/icons/human_face.dmi'
icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi'
icon_state = "hair_tribun"

/datum/sprite_accessory/hair/twintail
name = "Twintails"
icon = 'modular_bandastation/hair/icons/human_face.dmi'
icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi'
icon_state = "hair_twintail"

/datum/sprite_accessory/hair/unkempt
name = "Unkempt"
icon = 'modular_bandastation/hair/icons/human_face.dmi'
icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi'
icon_state = "hair_unkempt"

/datum/sprite_accessory/hair/verylongtails
name = "Very Long Twintails"
icon = 'modular_bandastation/hair/icons/human_face.dmi'
icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi'
icon_state = "hair_verylongtails"

/datum/sprite_accessory/hair/vivi
name = "Vivi"
icon = 'modular_bandastation/hair/icons/human_face.dmi'
icon = 'modular_bandastation/customization/icons/sprite_accessories/hair.dmi'
icon_state = "hair_vivi"
0 ...ar_bandastation/hair/icons/human_face.dmi → ...ization/icons/sprite_accessories/hair.dmi
View file
Open in desktop
File renamed without changes.
4 changes: 0 additions & 4 deletions modular_bandastation/hair/_hair.dm
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions modular_bandastation/hair/_hair.dme
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion modular_bandastation/modular_bandastation.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
#include "balance/_balance.dme"
#include "barsigns/_barsigns.dme"
#include "communication/_communication.dme"
#include "customization/_customization.dme"
#include "cyrillic_fixes/_cyrillic_fixes.dme"
#include "database220/_database220.dme"
#include "discord/_discord.dme"
#include "emote_panel/_emote_panel.dme"
#include "examine_panel/_examine_panel.dme"
#include "gunhud/_gunhud.dme"
#include "hair/_hair.dme"
#include "jobs/_jobs.dme"
#include "keybinding/_keybinding.dme"
#include "loadout/_loadout.dme"
Expand Down
2 changes: 1 addition & 1 deletion modular_bandastation/species/_species.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/datum/modpack/species
name = "Species"
desc = "Добавление архитектуры для новых видов и конфигурирования существующих."
author = "nlaysi, Podvaldeda"
author = "Nlaysi, Podvaldeda"
24 changes: 13 additions & 11 deletions modular_bandastation/species/_species.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
#include "_species.dm"

#include "code/_defines.dm"
#include "code/language.dm"
#include "code/dna.dm"
#include "code/language.dm"

#include "code/lizardperson/sprite_accesories/hair.dm"
#include "code/human/carbon.dm"
#include "code/human/sprite_accessories/vulpkanin.dm"
#include "code/clothing/items.dm"
#include "code/clothing/mod.dm"

#include "code/human/species/skills.dm"
#include "code/human/species_type/vulpkanin.dm"
#include "code/human/sprite_accessories/hair.dm"
#include "code/human/species/species.dm"
#include "code/surgery/organs/external/vulpkanin_external.dm"
#include "code/surgery/organs/internal/vulpkanin_internal.dm"
#include "code/surgery/organs/limbgrower_designs.dm"
#include "code/human/sprite_accessories/vulpkanin.dm"
#include "code/human/carbon.dm"

#include "code/preferences/species_features/vulpkanin.dm"
#include "code/surgery/bodyparts/vulpkanin_bodyparts.dm"

#include "code/reagents/mutation.dm"

#include "code/clothing/items.dm"
#include "code/clothing/mod.dm"
#include "code/surgery/bodyparts/vulpkanin_bodyparts.dm"
#include "code/surgery/organs/external/vulpkanin_external.dm"
#include "code/surgery/organs/internal/vulpkanin_internal.dm"
#include "code/surgery/organs/limbgrower_designs.dm"
10 changes: 5 additions & 5 deletions modular_bandastation/species/code/clothing/items.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@

/obj/item/clothing/head/mod
worn_icon_species = list(
SPECIES_VULPKANIN = 'modular_bandastation/species/icons/mob/species/clothing/vulp_modsuits.dmi',
SPECIES_VULPKANIN = 'modular_bandastation/species/icons/mob/species/vulpkanin/clothing/modsuits.dmi',
)

/obj/item/clothing/suit/mod
worn_icon_species = list(
SPECIES_VULPKANIN = 'modular_bandastation/species/icons/mob/species/clothing/vulp_modsuits.dmi',
SPECIES_VULPKANIN = 'modular_bandastation/species/icons/mob/species/vulpkanin/clothing/modsuits.dmi',
)

/obj/item/mod/module
worn_icon_species = list(
SPECIES_VULPKANIN = 'modular_bandastation/species/icons/mob/species/clothing/modules_vulp.dmi',
SPECIES_VULPKANIN = 'modular_bandastation/species/icons/mob/species/vulpkanin/clothing/modules.dmi',
)

/obj/item/clothing/suit
worn_icon_species = list(
SPECIES_VULPKANIN = 'modular_bandastation/species/icons/mob/species/clothing/suit.dmi',
SPECIES_VULPKANIN = 'modular_bandastation/species/icons/mob/species/vulpkanin/clothing/suit.dmi',
)

/obj/item/clothing/head
worn_icon_species = list(
SPECIES_VULPKANIN = 'modular_bandastation/species/icons/mob/species/clothing/head.dmi',
SPECIES_VULPKANIN = 'modular_bandastation/species/icons/mob/species/vulpkanin/clothing/head.dmi',
)
Empty file removed modular_bandastation/species/code/emote.dm
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions ...ion/species/code/human/species/species.dm → ...tion/species/code/human/species/skills.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#define GET_ATOM_SHIFF_FINGERPRINTS(atom) atom.forensics?.fingerprints
#define GET_ATOM_SHIFF_BLOOD_DNA(atom) atom.forensics?.blood_DNA

// MARK: Vulpkanin skills
/datum/action/cooldown/sniff
name = "Вынюхать"
desc = "Вы обнюхиваете предмет и определяете, кто с ним взаимодействовал. Также, вы можете запомнить запах определённого человека, обнюхав его."
Expand Down
Loading
Loading