Skip to content

Commit

Permalink
Merge pull request #4495 from MistakeNot4892/fix/accessories
Browse files Browse the repository at this point in the history 
Simplifies vox markings.
  • Loading branch information
@out-of-phaze
out-of-phaze authored Oct 11, 2024
2 parents a2f68a6 + e87a5bf commit 401e639
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 140 deletions.
126 changes: 12 additions & 114 deletions mods/species/vox/datum/accessories.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,14 @@
icon = 'mods/species/vox/icons/body/soldier/hair.dmi'
icon_state = "vox_longquills"
species_allowed = list(SPECIES_VOX)
body_flags_allowed = BODY_EQUIP_FLAG_VOX
bodytype_categories_allowed = list(BODYTYPE_VOX)
uid = "acc_hair_vox_longquills"

/decl/sprite_accessory/hair/vox/get_accessory_icon(obj/item/organ/external/organ)
var/decl/bodytype/vox/voxtype = organ.bodytype
if(istype(voxtype))
return voxtype.vox_hair_icon
return ..()

/decl/sprite_accessory/hair/vox/short
name = "Short Vox Quills"
icon_state = "vox_shortquills"
Expand All @@ -22,57 +26,21 @@
icon_state = "vox_stubble"
uid = "acc_hair_vox_stubble"

/decl/sprite_accessory/hair/vox/servitor
icon = 'mods/species/vox/icons/body/servitor/hair.dmi'
bodytype_categories_allowed = list(BODYTYPE_HUMANOID)
uid = "acc_hair_vox_longquills_servitor"

/decl/sprite_accessory/hair/vox/short/servitor
icon = 'mods/species/vox/icons/body/servitor/hair.dmi'
bodytype_categories_allowed = list(BODYTYPE_HUMANOID)
uid = "acc_hair_vox_shortquills_servitor"

/decl/sprite_accessory/hair/vox/mohawk/servitor
icon = 'mods/species/vox/icons/body/servitor/hair.dmi'
bodytype_categories_allowed = list(BODYTYPE_HUMANOID)
uid = "acc_hair_vox_mohawk_servitor"

/decl/sprite_accessory/hair/vox/stubble/servitor
icon = 'mods/species/vox/icons/body/servitor/hair.dmi'
bodytype_categories_allowed = list(BODYTYPE_HUMANOID)
uid = "acc_hair_vox_stubble_servitor"

/decl/sprite_accessory/hair/vox/stanchion
icon = 'mods/species/vox/icons/body/stanchion/hair.dmi'
bodytype_categories_allowed = list(BODYTYPE_VOX_LARGE)
uid = "acc_hair_vox_longquills_clockvox"

/decl/sprite_accessory/hair/vox/short/stanchion
icon = 'mods/species/vox/icons/body/stanchion/hair.dmi'
bodytype_categories_allowed = list(BODYTYPE_VOX_LARGE)
uid = "acc_hair_vox_shortquills_clockvox"

/decl/sprite_accessory/hair/vox/mohawk/stanchion
icon = 'mods/species/vox/icons/body/stanchion/hair.dmi'
bodytype_categories_allowed = list(BODYTYPE_VOX_LARGE)
uid = "acc_hair_vox_mohawk_clockvox"

/decl/sprite_accessory/hair/vox/stubble/stanchion
icon = 'mods/species/vox/icons/body/stanchion/hair.dmi'
bodytype_categories_allowed = list(BODYTYPE_VOX_LARGE)
uid = "acc_hair_vox_stubble_clockvox"

/decl/sprite_accessory/marking/vox
name = "Vox Neck Markings"
icon_state = "neck_markings"
body_parts = list(BP_HEAD)
species_allowed = list(SPECIES_VOX)
body_flags_allowed = BODY_EQUIP_FLAG_VOX
bodytype_categories_allowed = list(BODYTYPE_VOX)
icon = 'mods/species/vox/icons/body/soldier/markings.dmi'
color_blend = ICON_MULTIPLY
uid = "acc_markings_vox_neck"

/decl/sprite_accessory/marking/vox/get_accessory_icon(obj/item/organ/external/organ)
var/decl/bodytype/vox/voxtype = organ.bodytype
if(istype(voxtype))
return voxtype.vox_marking_icon
return ..()

/decl/sprite_accessory/marking/vox/claws
name = "Vox Claws"
icon_state = "claws"
Expand Down Expand Up @@ -105,73 +73,3 @@
name = "Vox Crest Colouration"
icon_state = "crest"
uid = "acc_markings_vox_crest"

/decl/sprite_accessory/marking/vox/servitor
icon = 'mods/species/vox/icons/body/servitor/markings.dmi'
bodytype_categories_allowed = list(BODYTYPE_HUMANOID)
uid = "acc_markings_vox_neck_servitor"

/decl/sprite_accessory/marking/vox/claws/servitor
icon = 'mods/species/vox/icons/body/servitor/markings.dmi'
bodytype_categories_allowed = list(BODYTYPE_HUMANOID)
uid = "acc_markings_vox_claws_servitor"

/decl/sprite_accessory/marking/vox/beak/servitor
icon = 'mods/species/vox/icons/body/servitor/markings.dmi'
bodytype_categories_allowed = list(BODYTYPE_HUMANOID)
uid = "acc_markings_vox_beak_servitor"

/decl/sprite_accessory/marking/vox/scutes/servitor
icon = 'mods/species/vox/icons/body/servitor/markings.dmi'
bodytype_categories_allowed = list(BODYTYPE_HUMANOID)
uid = "acc_markings_vox_scutes_servitor"

/decl/sprite_accessory/marking/vox/arm_markings/servitor
icon = 'mods/species/vox/icons/body/servitor/markings.dmi'
bodytype_categories_allowed = list(BODYTYPE_HUMANOID)
uid = "acc_markings_vox_leftarm_servitor"

/decl/sprite_accessory/marking/vox/arm_markings/right/servitor
icon = 'mods/species/vox/icons/body/servitor/markings.dmi'
bodytype_categories_allowed = list(BODYTYPE_HUMANOID)
uid = "acc_markings_vox_rightarm_servitor"

/decl/sprite_accessory/marking/vox/crest/servitor
icon = 'mods/species/vox/icons/body/servitor/markings.dmi'
bodytype_categories_allowed = list(BODYTYPE_HUMANOID)
uid = "acc_markings_vox_crest_servitor"

/decl/sprite_accessory/marking/vox/stanchion
icon = 'mods/species/vox/icons/body/stanchion/markings.dmi'
bodytype_categories_allowed = list(BODYTYPE_VOX_LARGE)
uid = "acc_markings_vox_neck_clockvox"

/decl/sprite_accessory/marking/vox/claws/stanchion
icon = 'mods/species/vox/icons/body/stanchion/markings.dmi'
bodytype_categories_allowed = list(BODYTYPE_VOX_LARGE)
uid = "acc_markings_vox_claws_clockvox"

/decl/sprite_accessory/marking/vox/beak/stanchion
icon = 'mods/species/vox/icons/body/stanchion/markings.dmi'
bodytype_categories_allowed = list(BODYTYPE_VOX_LARGE)
uid = "acc_markings_vox_beak_clockvox"

/decl/sprite_accessory/marking/vox/scutes/stanchion
icon = 'mods/species/vox/icons/body/stanchion/markings.dmi'
bodytype_categories_allowed = list(BODYTYPE_VOX_LARGE)
uid = "acc_markings_vox_scutes_clockvox"

/decl/sprite_accessory/marking/vox/arm_markings/stanchion
icon = 'mods/species/vox/icons/body/stanchion/markings.dmi'
bodytype_categories_allowed = list(BODYTYPE_VOX_LARGE)
uid = "acc_markings_vox_leftarm_clockvox"

/decl/sprite_accessory/marking/vox/arm_markings/right/stanchion
icon = 'mods/species/vox/icons/body/stanchion/markings.dmi'
bodytype_categories_allowed = list(BODYTYPE_VOX_LARGE)
uid = "acc_markings_vox_rightarm_clockvox"

/decl/sprite_accessory/marking/vox/crest/stanchion
icon = 'mods/species/vox/icons/body/stanchion/markings.dmi'
bodytype_categories_allowed = list(BODYTYPE_VOX_LARGE)
uid = "acc_markings_vox_crest_clockvox"
33 changes: 7 additions & 26 deletions mods/species/vox/datum/species_bodytypes.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@
)
)

var/vox_hair_icon = 'mods/species/vox/icons/body/soldier/hair.dmi'
var/vox_marking_icon = 'mods/species/vox/icons/body/soldier/markings.dmi'

/decl/bodytype/vox/Initialize()
if(!length(equip_adjust))
equip_adjust = list(
Expand Down Expand Up @@ -85,23 +88,12 @@
blood_overlays = 'mods/species/vox/icons/body/blood_overlays.dmi'
eye_icon = 'mods/species/vox/icons/body/servitor/eyes.dmi'
uid = "bodytype_vox_servitor"

default_sprite_accessories = list(
SAC_HAIR = list(
/decl/sprite_accessory/hair/vox/short/servitor = list(SAM_COLOR = "#160900")
),
SAC_MARKINGS = list(
/decl/sprite_accessory/marking/vox/beak/servitor = list(SAM_COLOR = "#bc7d3e"),
/decl/sprite_accessory/marking/vox/scutes/servitor = list(SAM_COLOR = "#bc7d3e"),
/decl/sprite_accessory/marking/vox/crest/servitor = list(SAM_COLOR = "#bc7d3e"),
/decl/sprite_accessory/marking/vox/claws/servitor = list(SAM_COLOR = "#a0a654")
)
)

override_limb_types = list(
BP_GROIN = /obj/item/organ/external/groin/vox,
BP_TAIL = /obj/item/organ/external/tail/vox/servitor
)
vox_hair_icon = 'mods/species/vox/icons/body/servitor/hair.dmi'
vox_marking_icon = 'mods/species/vox/icons/body/servitor/markings.dmi'

/decl/bodytype/vox/stanchion
name = "stanchion voxform"
Expand All @@ -112,24 +104,13 @@
eye_icon = 'mods/species/vox/icons/body/stanchion/eyes.dmi'
icon_template = 'mods/species/vox/icons/body/stanchion/template.dmi'
uid = "bodytype_vox_stanchion"

default_sprite_accessories = list(
SAC_HAIR = list(
/decl/sprite_accessory/hair/vox/short/stanchion = list(SAM_COLOR = "#160900")
),
SAC_MARKINGS = list(
/decl/sprite_accessory/marking/vox/beak/stanchion = list(SAM_COLOR = "#bc7d3e"),
/decl/sprite_accessory/marking/vox/scutes/stanchion = list(SAM_COLOR = "#bc7d3e"),
/decl/sprite_accessory/marking/vox/crest/stanchion = list(SAM_COLOR = "#bc7d3e"),
/decl/sprite_accessory/marking/vox/claws/stanchion = list(SAM_COLOR = "#a0a654")
)
)

override_limb_types = list(
BP_GROIN = /obj/item/organ/external/groin/vox,
// Commenting this out so that tail validation doesn't try to find a species using this bodytype.
//BP_TAIL = /obj/item/organ/external/tail/vox/stanchion
)
vox_hair_icon = 'mods/species/vox/icons/body/stanchion/hair.dmi'
vox_marking_icon = 'mods/species/vox/icons/body/stanchion/markings.dmi'

/decl/bodytype/vox/servitor/alchemist
name = "alchemist voxform"
Expand Down

0 comments on commit 401e639

Please sign in to comment.