Skip to content

Commit

Permalink
markings
Browse files Browse the repository at this point in the history
  • Loading branch information
linnpap committed Jan 6, 2023
1 parent 33bda16 commit af27b72
Show file tree
Hide file tree
Showing 6 changed files with 152 additions and 17 deletions.
14 changes: 9 additions & 5 deletions code/modules/mob/new_player/sprite_accessories.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2631,7 +2631,8 @@ shaved
icon_state = "taj_bellyfull"
body_parts = list(BP_TORSO)
species_allowed = list(SPECIES_TAJ)

/*
// FLIPPER REMOVAL - axes redundant markings
/datum/sprite_accessory/marking/taj_earsout
name = "Outer Ear (Taj)"
icon_state = "taj_earsout"
Expand All @@ -2649,13 +2650,14 @@ shaved
icon_state = "taj_nose"
body_parts = list(BP_HEAD)
species_allowed = list(SPECIES_TAJ)

*/
/datum/sprite_accessory/marking/taj_crest
name = "Chest Fur Crest (Taj)"
icon_state = "taj_crest"
body_parts = list(BP_TORSO)
species_allowed = list(SPECIES_TAJ)

/*
// FLIPPER REMOVAL - axes redundant markings
/datum/sprite_accessory/marking/taj_muzzle
name = "Muzzle Color (Taj)"
icon_state = "taj_muzzle"
Expand All @@ -2673,8 +2675,10 @@ shaved
icon_state = "taj_all"
body_parts = list(BP_HEAD)
species_allowed = list(SPECIES_TAJ)

*/
//Una specific stuff
/*
// FLIPPER REMOVAL - axes redundant markings
/datum/sprite_accessory/marking/una_face
name = "Face Color (Una)"
icon_state = "una_face"
Expand All @@ -2686,7 +2690,7 @@ shaved
icon_state = "una_facelow"
body_parts = list(BP_HEAD)
species_allowed = list(SPECIES_UNATHI)

*/
/datum/sprite_accessory/marking/una_scutes
name = "Scutes (Una)"
icon_state = "una_scutes"
Expand Down
33 changes: 21 additions & 12 deletions code/modules/mob/new_player/sprite_accessories_extra.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_TORSO,BP_GROIN)

/*
// FLIPPER REMOVAL - axes redundant markings
/datum/sprite_accessory/marking/vr/vulp_nose
name = "nose (canine)"
icon_state = "vulp_nose"
Expand Down Expand Up @@ -76,7 +78,7 @@
color_blend_mode = ICON_MULTIPLY
body_parts = list(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_GROIN,BP_TORSO,BP_HEAD)
species_allowed = list("Sergal")

*/
/datum/sprite_accessory/marking/vr/monoeye
name = "Monoeye"
icon_state = "monoeye"
Expand All @@ -97,7 +99,8 @@
icon_state = "brows"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)

/*
// FLIPPER REMOVAL - axes redundant markings
/datum/sprite_accessory/marking/vr/nevrean_female
name = "Female Nevrean beak"
icon_state = "nevrean_f"
Expand All @@ -111,7 +114,7 @@
body_parts = list(BP_HEAD)
color_blend_mode = ICON_MULTIPLY
gender = MALE

*/
/datum/sprite_accessory/marking/vr/spots
name = "Spots"
icon_state = "spots"
Expand Down Expand Up @@ -153,7 +156,8 @@
name = "Tusks"
icon_state = "tusks"
body_parts = list(BP_HEAD)

/*
// FLIPPER REMOVAL - axes redundant markings
/datum/sprite_accessory/marking/vr/otie_face
name = "Otie face"
icon_state = "otieface"
Expand All @@ -171,7 +175,7 @@
icon_state = "otienose_lite"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)

*/
/datum/sprite_accessory/marking/vr/backstripes
name = "Back stripes"
icon_state = "otiestripes"
Expand All @@ -195,13 +199,14 @@
icon_state = "otiesocks"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND)

/*
// FLIPPER REMOVAL - axes redundant markings
/datum/sprite_accessory/marking/vr/corvid_beak
name = "Corvid beak"
icon_state = "corvidbeak"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)

*/
/datum/sprite_accessory/marking/vr/corvid_belly
name = "Corvid belly"
icon_state = "corvidbelly"
Expand Down Expand Up @@ -231,7 +236,8 @@
icon_state = "zbody"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_LEG,BP_R_LEG,BP_GROIN,BP_TORSO)

/*
// FLIPPER REMOVAL - axes redundant markings
/datum/sprite_accessory/marking/vr/znose
name = "Jagged snout"
icon_state = "znose"
Expand Down Expand Up @@ -267,7 +273,7 @@
icon_state = "shepface"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)

*/
/datum/sprite_accessory/marking/vr/sheppy_back
name = "Shepherd back"
icon_state = "shepback"
Expand All @@ -291,7 +297,8 @@
icon_state = "zorren_backpatch"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_TORSO)

/*
// FLIPPER REMOVAL - axes redundant markings
/datum/sprite_accessory/marking/vr/zorren_face_male
name = "Zorren Male Face"
icon_state = "zorren_face"
Expand Down Expand Up @@ -319,7 +326,7 @@
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
gender = FEMALE

*/
/datum/sprite_accessory/marking/vr/zorren_socks
name = "Zorren Socks"
icon_state = "zorren_socks"
Expand Down Expand Up @@ -501,7 +508,8 @@
icon_state = "claws"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_HAND,BP_R_HAND)

/*
// FLIPPER REMOVAL - axes redundant markings
/datum/sprite_accessory/marking/vr/equine_snout //Why the long face? Works best with sergal bodytype.
name = "Equine Snout"
icon_state = "donkey"
Expand All @@ -513,3 +521,4 @@
icon_state = "dnose"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
*/
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
/datum/sprite_accessory/marking/flipper
icon = 'modular_flipper/icons/mob/human_races/sprite_accessories/markings.dmi'
color_blend_mode = ICON_MULTIPLY
species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_ANTHRO, SPECIES_AQUATIC)

/datum/sprite_accessory/marking/flipper/floof_head
name = "Floof (head)"
icon_state = "floof"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/flipper/floof_chest
name = "Floof (torso)"
icon_state = "floof"
body_parts = list(BP_TORSO)

/datum/sprite_accessory/marking/flipper/bellyslim
name = "Slim Belly"
icon_state = "bellyslim"
body_parts = list(BP_HEAD, BP_TORSO)

/datum/sprite_accessory/marking/flipper/bellyslim_alt
name = "Slim Belly (alt)"
icon_state = "bellyslim_alt"
body_parts = list(BP_HEAD, BP_TORSO)

/datum/sprite_accessory/marking/flipper/plain_head
name = "Plain (head)"
icon_state = "plain"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/flipper/plain_torso
name = "Plain (torso)"
icon_state = "plain"
body_parts = list(BP_TORSO)

/datum/sprite_accessory/marking/flipper/plainf_torso
name = "Plain (feminine torso)"
icon_state = "plainf"
body_parts = list(BP_TORSO)

/datum/sprite_accessory/marking/flipper/plain_larm
name = "Plain (left arm)"
icon_state = "plain"
body_parts = list(BP_L_ARM)

/datum/sprite_accessory/marking/flipper/plain_rarm
name = "Plain (right arm)"
icon_state = "plain"
body_parts = list(BP_R_ARM)

/datum/sprite_accessory/marking/flipper/plain_lhand
name = "Plain (left hand)"
icon_state = "plain"
body_parts = list(BP_L_HAND)

/datum/sprite_accessory/marking/flipper/plain_rhand
name = "Plain (right hand)"
icon_state = "plain"
body_parts = list(BP_R_HAND)

/datum/sprite_accessory/marking/flipper/plain_lleg
name = "Plain (left leg)"
icon_state = "plain"
body_parts = list(BP_L_LEG)

/datum/sprite_accessory/marking/flipper/plain_rleg
name = "Plain (right leg)"
icon_state = "plain"
body_parts = list(BP_R_LEG)

/datum/sprite_accessory/marking/flipper/plain_lfoot
name = "Plain (left foot)"
icon_state = "plain"
body_parts = list(BP_L_FOOT)

/datum/sprite_accessory/marking/flipper/plain_rfoot
name = "Plain (right foot)"
icon_state = "plain"
body_parts = list(BP_R_FOOT)

//frills

/datum/sprite_accessory/marking/flipper/frills_divinity
name = "Divinity (frills)"
icon_state = "frills_divinity"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/flipper/frills_horns
name = "Horns (frills)"
icon_state = "frills_horns"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/flipper/frills_doublehorns
name = "Double Horns (frills)"
icon_state = "frills_doublehorns"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/flipper/frills_big
name = "Big (frills)"
icon_state = "frills_big"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/flipper/frills_neck
name = "Neck (frills)"
icon_state = "frills_neck"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/flipper/frills_neckfull
name = "Full Neck (frills)"
icon_state = "frills_neckfull"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/flipper/frills_cobrahood
name = "Cobra Hood (part A)"
icon_state = "frills_cobrahood"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/flipper/frills_cobrahood_extra
name = "Cobra Hood (part B)"
icon_state = "frills_cobrahood_extra"
body_parts = list(BP_HEAD)
Binary file not shown.
Binary file modified modular_flipper/icons/mob/human_races/sprite_accessories/snout.dmi
Binary file not shown.
1 change: 1 addition & 0 deletions polaris.dme
Original file line number Diff line number Diff line change
Expand Up @@ -3330,6 +3330,7 @@
#include "modular_flipper\code\modules\mob\living\carbon\human\species\station\moth.dm"
#include "modular_flipper\code\modules\mob\living\carbon\human\species\station\station.dm"
#include "modular_flipper\code\modules\mob\living\carbon\human\species\station\teshari.dm"
#include "modular_flipper\code\modules\mob\new_player\sprite_accessories_flipper.dm"
#include "modular_flipper\code\modules\mob\new_player\sprite_accessories_snout.dm"
#include "modular_flipper\code\modules\organs\subtypes\standard.dm"
// END_INCLUDE

0 comments on commit af27b72

Please sign in to comment.