cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1382 from CHOMPStationBot/upstream-merge-9770

Browse Source 
[MIRROR] Fixes missed merge conflict hair stuff
This commit is contained in:
Nadyr
2021-02-28 07:18:53 -05:00
committed by GitHub
parent bc944aacf1 ec53fc89cd
commit 1c8d0fa380
8 changed files with 360 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

352
code/modules/mob/new_player/sprite_accessories.dm
View File

@@ -34,6 +34,11 @@
// Whether or not the accessory can be affected by colouration
var/do_colouration = 1
var/color_blend_mode = ICON_MULTIPLY // If checked.
// Ckey of person allowed to use this, if defined.
var/list/ckeys_allowed = null
var/apply_restrictions = FALSE //whether to apply restrictions for specific tails/ears/wings
/*
////////////////////////////
@@ -112,6 +117,12 @@
name = "Antenna"
icon_state = "hair_antenna"
/datum/sprite_accessory/hair/astolfo
name = "Astolfo"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "hair_astolfo"
/datum/sprite_accessory/hair/averagejoe
name = "Average Joe"
icon_state = "hair_averagejoe"
@@ -332,6 +343,13 @@
icon_state = "hair_celebcurls"
flags = HAIR_TIEABLE
/datum/sprite_accessory/hair/citheronia_colorable
name = "Citheronia"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "citheronia_hair_c"
do_colouration = 1
/datum/sprite_accessory/hair/crono
name = "Chrono"
icon_state = "hair_toriyama"
@@ -519,6 +537,12 @@
icon_state = "hair_sargeant"
flags = HAIR_VERY_SHORT
/datum/sprite_accessory/hair/braid
name = "Floorlength Braid"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "hair_braid"
/datum/sprite_accessory/hair/flowhair
name = "Flow Hair"
icon_state = "hair_f"
@@ -967,6 +991,12 @@
icon_state = "hair_shorthair4"
flags = HAIR_VERY_SHORT
/datum/sprite_accessory/hair/awoohair
name = "Shoulder-length Messy"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "momijihair"
/datum/sprite_accessory/hair/shy
name = "Shy"
icon_state = "hair_shy"
@@ -1086,6 +1116,12 @@
gender = MALE
flags = HAIR_VERY_SHORT
/datum/sprite_accessory/hair/twindrills
name = "Twin Drills"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "hair_twincurl"
/datum/sprite_accessory/hair/twintail
name = "Twintail"
icon_state = "hair_twintail"
@@ -1157,6 +1193,322 @@
icon_state = "hair_ziegler"
flags = HAIR_TIEABLE
/datum/sprite_accessory/hair/una_hood
name = "Cobra Hood"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "soghun_hood"
species_allowed = list(SPECIES_UNATHI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
/datum/sprite_accessory/hair/una_doublehorns
name = "Double Unathi Horns"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "soghun_dubhorns"
species_allowed = list(SPECIES_UNATHI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
/datum/sprite_accessory/hair/sergal_plain
name = "Sergal Plain"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "serg_plain"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
/datum/sprite_accessory/hair/sergal_medicore
name = "Sergal Medicore"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "serg_medicore"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
/datum/sprite_accessory/hair/sergal_tapered
name = "Sergal Tapered"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "serg_tapered"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
/datum/sprite_accessory/hair/sergal_fairytail
name = "Sergal Fairytail"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "serg_fairytail"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
// Vulpa stuffs
/datum/sprite_accessory/hair/vulp_hair_none
name = "None"
icon_state = "bald"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
gender = NEUTER
/datum/sprite_accessory/hair/vulp_hair_kajam
name = "Kajam"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "kajam"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
gender = NEUTER
/datum/sprite_accessory/hair/vulp_hair_keid
name = "Keid"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "keid"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
gender = NEUTER
/datum/sprite_accessory/hair/vulp_hair_adhara
name = "Adhara"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "adhara"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
gender = NEUTER
/datum/sprite_accessory/hair/vulp_hair_kleeia
name = "Kleeia"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "kleeia"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
gender = NEUTER
/datum/sprite_accessory/hair/vulp_hair_mizar
name = "Mizar"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "mizar"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
gender = NEUTER
/datum/sprite_accessory/hair/vulp_hair_apollo
name = "Apollo"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "apollo"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
gender = NEUTER
/datum/sprite_accessory/hair/vulp_hair_belle
name = "Belle"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "belle"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
gender = NEUTER
/datum/sprite_accessory/hair/vulp_hair_bun
name = "Vulp Bun"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "bun"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
gender = NEUTER
/datum/sprite_accessory/hair/vulp_hair_jagged
name = "Jagged"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "jagged"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
gender = NEUTER
/datum/sprite_accessory/hair/vulp_hair_curl
name = "Curl"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "curl"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
gender = NEUTER
/datum/sprite_accessory/hair/vulp_hair_hawk
name = "Hawk"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "hawk"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
gender = NEUTER
/datum/sprite_accessory/hair/vulp_hair_anita
name = "Anita"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "anita"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
gender = NEUTER
/datum/sprite_accessory/hair/vulp_hair_short
name = "Short"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "short"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
gender = NEUTER
/datum/sprite_accessory/hair/vulp_hair_spike
name = "Spike"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "spike"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
gender = NEUTER
//xeno stuffs
/datum/sprite_accessory/hair/xeno_head_drone_color
name = "Drone dome"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "cxeno_drone"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
gender = NEUTER
// figure this one out for better coloring
/datum/sprite_accessory/hair/xeno_head_sentinel_color
name = "Sentinal dome"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "cxeno_sentinel"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
gender = NEUTER
/datum/sprite_accessory/hair/xeno_head_queen_color
name = "Queen dome"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "cxeno_queen"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
gender = NEUTER
/datum/sprite_accessory/hair/xeno_head_hunter_color
name = "Hunter dome"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "cxeno_hunter"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
gender = NEUTER
/datum/sprite_accessory/hair/xeno_head_praetorian_color
name = "Praetorian dome"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "cxeno_praetorian"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
gender = NEUTER
// Shadekin stuffs
/datum/sprite_accessory/hair/shadekin_hair_short
name = "Shadekin Short Hair"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "shadekin_short"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
gender = NEUTER
/datum/sprite_accessory/hair/shadekin_hair_poofy
name = "Shadekin Poofy Hair"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "shadekin_poofy"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
gender = NEUTER
/datum/sprite_accessory/hair/shadekin_hair_long
name = "Shadekin Long Hair"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "shadekin_long"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
gender = NEUTER
/*
shaved
name = "Shaved"
icon_state = "bald"
gender = NEUTER
species_allowed = list(SPECIES_HUMAN, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
*/
/datum/sprite_accessory/facial_hair/neck_fluff
name = "Neck Fluff"
icon = 'icons/mob/human_face_or_alt.dmi'
icon_state = "facial_neckfluff"
gender = NEUTER
species_allowed = list(SPECIES_TAJ, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
color_blend_mode = ICON_MULTIPLY
/datum/sprite_accessory/facial_hair/vulp_none
name = "None"
icon = 'icons/mob/human_face_alt.dmi'
icon_state = "none"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
gender = NEUTER
color_blend_mode = ICON_MULTIPLY
/datum/sprite_accessory/facial_hair/vulp_blaze
name = "Blaze"
icon = 'icons/mob/human_face_alt.dmi'
icon_state = "vulp_facial_blaze"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
gender = NEUTER
color_blend_mode = ICON_MULTIPLY
/datum/sprite_accessory/facial_hair/vulp_vulpine
name = "Vulpine"
icon = 'icons/mob/human_face_alt.dmi'
icon_state = "vulp_facial_vulpine"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
gender = NEUTER
color_blend_mode = ICON_MULTIPLY
/datum/sprite_accessory/facial_hair/vulp_earfluff
name = "Earfluff"
icon = 'icons/mob/human_face_alt.dmi'
icon_state = "vulp_facial_earfluff"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
gender = NEUTER
color_blend_mode = ICON_MULTIPLY
/datum/sprite_accessory/facial_hair/vulp_mask
name = "Mask"
icon = 'icons/mob/human_face_alt.dmi'
icon_state = "vulp_facial_mask"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
gender = NEUTER
color_blend_mode = ICON_MULTIPLY
/datum/sprite_accessory/facial_hair/vulp_patch
name = "Patch"
icon = 'icons/mob/human_face_alt.dmi'
icon_state = "vulp_facial_patch"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
gender = NEUTER
color_blend_mode = ICON_MULTIPLY
/datum/sprite_accessory/facial_hair/vulp_ruff
name = "Ruff"
icon = 'icons/mob/human_face_alt.dmi'
icon_state = "vulp_facial_ruff"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
gender = NEUTER
color_blend_mode = ICON_MULTIPLY
/datum/sprite_accessory/facial_hair/vulp_kita
name = "Kita"
icon = 'icons/mob/human_face_alt.dmi'
icon_state = "vulp_facial_kita"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
gender = NEUTER
color_blend_mode = ICON_MULTIPLY
/datum/sprite_accessory/facial_hair/vulp_swift
name = "Swift"
icon = 'icons/mob/human_face_alt.dmi'
icon_state = "vulp_facial_swift"
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
gender = NEUTER
color_blend_mode = ICON_MULTIPLY
/*
///////////////////////////////////
/ =---------------------------= /

6
code/modules/mob/new_player/sprite_accessories_vr.dm
View File

@@ -6,8 +6,6 @@
/datum/sprite_accessory/hair
//var/icon_add = 'icons/mob/human_face.dmi' //Already defined in sprite_accessories.dm line 49.
var/color_blend_mode = ICON_MULTIPLY
species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_FENNEC, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST, SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW, SPECIES_SHADEKIN_YW) //This lets all races use the default hairstyles.
astolfo
@@ -526,7 +524,7 @@
/datum/sprite_accessory/facial_hair
icon = 'icons/mob/human_face_or_vr.dmi'
var/color_blend_mode = ICON_MULTIPLY
color_blend_mode = ICON_MULTIPLY
species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_FENNEC, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST) //This lets all races use the facial hair styles.
shaved
@@ -609,7 +607,7 @@
//Reminder: BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_TORSO,BP_GROIN,BP_HEAD
/datum/sprite_accessory/marking //Override for base markings
var/color_blend_mode = ICON_ADD
color_blend_mode = ICON_ADD
/datum/sprite_accessory/marking/vr
icon = 'icons/mob/human_races/markings_vr.dmi'