Skip to content

Commit

Permalink
more epic fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@maaacha
maaacha committed Nov 7, 2024
1 parent fdc4dc2 commit 1f6e454
Show file tree
Hide file tree
Showing 8 changed files with 83 additions and 72 deletions.
4 changes: 4 additions & 0 deletions code/__DEFINES/mobs.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -735,6 +735,8 @@ GLOBAL_LIST_INIT(human_heights_to_offsets, list(
#define ID_CARD_LAYER 25
/// Layer for bodyparts that should appear above every other bodypart - Currently only used for hands
#define BODYPARTS_HIGH_LAYER 24
// For hand markings :3c - DOPPLER ADDITION
#define BODY_HAND_LAYER 23.99
/// Gloves layer
#define GLOVES_LAYER 23
/// Shoes layer
Expand Down Expand Up @@ -854,6 +856,8 @@ GLOBAL_LIST_INIT(layers_to_offset, list(
#define EXTERNAL_BEHIND (1 << 6)
#define EXTERNAL_BEHIND_2 (1 << 7)
#define EXTERNAL_BEHIND_3 (1 << 8)
//Hand markings
#define EXTERNAL_HAND (1 << 9)
/// DOPPLER SHIFT ADDITION END
/// Draws organ on all EXTERNAL layers
#define ALL_EXTERNAL_OVERLAYS EXTERNAL_FRONT | EXTERNAL_ADJACENT | EXTERNAL_BEHIND
Expand Down
6 changes: 5 additions & 1 deletion code/datums/bodypart_overlays/bodypart_overlay.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
/// DOPPLER SHIFT ADDITION BEGIN
var/static/list/all_layers = list(EXTERNAL_FRONT,EXTERNAL_FRONT_2,EXTERNAL_FRONT_3,
EXTERNAL_ADJACENT,EXTERNAL_ADJACENT_2,EXTERNAL_ADJACENT_3,
EXTERNAL_BEHIND,EXTERNAL_BEHIND_2,EXTERNAL_BEHIND_3)
EXTERNAL_BEHIND,EXTERNAL_BEHIND_2,EXTERNAL_BEHIND_3, EXTERNAL_HAND)
/// DOPPLER SHIFT ADDITION END

///Key of the icon states of all the sprite_datums for easy caching
Expand Down Expand Up @@ -75,6 +75,8 @@
return "FRONT_2"
if(-BODY_FRONT_LAYER_3)
return "FRONT_3"
if(-BODY_HAND_LAYER)
return "HAND"
/// DOPPLER SHIFT ADDITION END

///Converts a bitflag to the right layer. I'd love to make this a static index list, but byond made an attempt on my life when i did
Expand All @@ -99,6 +101,8 @@
return -BODY_FRONT_LAYER_2
if(EXTERNAL_FRONT_3)
return -BODY_FRONT_LAYER_3
if(EXTERNAL_HAND)
return -BODY_HAND_LAYER
/// DOPPLER SHIFT ADDITION END

///Check whether we can draw the overlays. You generally don't want lizard snouts to draw over an EVA suit
Expand Down
16 changes: 3 additions & 13 deletions modular_doppler/modular_customization/markings/body_markings/other.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,7 @@
/datum/sprite_accessory/body_marking/other/pilot
name = "Pilot"
icon_state = "pilot"
body_zones = HEAD | ARM_LEFT | ARM_RIGHT

/datum/sprite_accessory/body_marking/other/pilot_hand
name = "Pilot Hand"
icon_state = "pilot_hand"
body_zones = HAND_LEFT | HAND_RIGHT
body_zones = HEAD | ARM_LEFT | ARM_RIGHT | HAND_LEFT | HAND_RIGHT

/datum/sprite_accessory/body_marking/other/big_ol_eyes
name = "Large Eyes"
Expand All @@ -132,19 +127,14 @@
/datum/sprite_accessory/body_marking/other/bands
name = "Color Bands"
icon_state = "bands"
body_zones = CHEST | ARM_LEFT | ARM_RIGHT | LEG_RIGHT | LEG_LEFT
body_zones = CHEST | ARM_LEFT | ARM_RIGHT | LEG_RIGHT | LEG_LEFT | HAND_LEFT | HAND_RIGHT


/datum/sprite_accessory/body_marking/other/bands_foot
name = "Color Bands (Foot)"
icon_state = "bands_foot"
body_zones = LEG_RIGHT | LEG_LEFT


/datum/sprite_accessory/body_marking/other/bands_hand
name = "Color Bands (Hand)"
icon_state = "bands_hand"
body_zones = HAND_RIGHT | HAND_LEFT

/datum/sprite_accessory/body_marking/other/anklet
name = "Anklet"
icon_state = "anklet"
Expand Down
57 changes: 26 additions & 31 deletions modular_doppler/modular_customization/markings/body_markings/secondary.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,37 +15,32 @@
/datum/sprite_accessory/body_marking/secondary/husky
name = "Husky"
icon_state = "husky"
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | LEG_RIGHT | LEG_LEFT
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | HAND_LEFT | HAND_RIGHT | LEG_RIGHT | LEG_LEFT

/datum/sprite_accessory/body_marking/secondary/husky_hand
name = "Husky Hand"
icon_state = "husky_hand"
body_zones = HAND_LEFT | HAND_RIGHT
icon_state = "husky"
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | HAND_LEFT | HAND_RIGHT | LEG_RIGHT | LEG_LEFT

/datum/sprite_accessory/body_marking/secondary/fennec
name = "Fennec"
icon_state = "fennec"
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | LEG_RIGHT | LEG_LEFT

/datum/sprite_accessory/body_marking/secondary/fennechand
name = "Fennec (Hand)"
icon_state = "fennec_hand"
body_zones = HAND_LEFT | HAND_RIGHT
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | HAND_LEFT | HAND_RIGHT | LEG_RIGHT | LEG_LEFT

/datum/sprite_accessory/body_marking/secondary/redpanda
name = "Red Panda"
icon_state = "redpanda"
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT| LEG_RIGHT | LEG_LEFT // | HAND_LEFT | HAND_RIGHT
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | HAND_LEFT | HAND_RIGHT | LEG_RIGHT | LEG_LEFT

/datum/sprite_accessory/body_marking/secondary/dalmatian
name = "Dalmatian"
icon_state = "dalmation"
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | LEG_RIGHT | LEG_LEFT // | HAND_LEFT | HAND_RIGHT
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | HAND_LEFT | HAND_RIGHT | LEG_RIGHT | LEG_LEFT

/datum/sprite_accessory/body_marking/secondary/shepherd
name = "Shepherd"
icon_state = "shepherd"
body_zones = CHEST | ARM_LEFT | ARM_RIGHT | LEG_RIGHT | LEG_LEFT // | HAND_LEFT | HAND_RIGHT
body_zones = CHEST | ARM_LEFT | ARM_RIGHT | HAND_LEFT | HAND_RIGHT | LEG_RIGHT | LEG_LEFT

/datum/sprite_accessory/body_marking/secondary/wolf
name = "Wolf"
Expand All @@ -60,12 +55,12 @@
/datum/sprite_accessory/body_marking/secondary/raccoon
name = "Raccoon"
icon_state = "raccoon"
body_zones = HEAD | CHEST | LEG_RIGHT | LEG_LEFT // | HAND_LEFT | HAND_RIGHT
body_zones = HEAD | CHEST | HAND_LEFT | HAND_RIGHT | LEG_RIGHT | LEG_LEFT

/datum/sprite_accessory/body_marking/secondary/bovine
name = "Bovine"
icon_state = "bovine"
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | LEG_RIGHT | LEG_LEFT // | HAND_LEFT | HAND_RIGHT
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | HAND_LEFT | HAND_RIGHT | LEG_RIGHT | LEG_LEFT

/datum/sprite_accessory/body_marking/secondary/possum
name = "Possum"
Expand All @@ -75,12 +70,12 @@
/datum/sprite_accessory/body_marking/secondary/corgi
name = "Corgi"
icon_state = "corgi"
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | LEG_RIGHT | LEG_LEFT // | HAND_LEFT | HAND_RIGHT
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | HAND_LEFT | HAND_RIGHT | LEG_RIGHT | LEG_LEFT

/datum/sprite_accessory/body_marking/secondary/leopard1
name = "Leopard"
icon_state = "leopard1"
body_zones = CHEST | ARM_LEFT | ARM_RIGHT | LEG_RIGHT | LEG_LEFT // | HAND_LEFT | HAND_RIGHT
body_zones = CHEST | ARM_LEFT | ARM_RIGHT | HAND_LEFT | HAND_RIGHT | LEG_RIGHT | LEG_LEFT

/datum/sprite_accessory/body_marking/secondary/leopard2
name = "Leopard (alt)"
Expand All @@ -95,7 +90,7 @@
/datum/sprite_accessory/body_marking/secondary/panther
name = "Panther"
icon_state = "panther"
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | LEG_RIGHT | LEG_LEFT // | HAND_LEFT | HAND_RIGHT
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | HAND_LEFT | HAND_RIGHT | LEG_RIGHT | LEG_LEFT

/datum/sprite_accessory/body_marking/secondary/tiger
name = "Tiger Spot"
Expand All @@ -110,12 +105,12 @@
/datum/sprite_accessory/body_marking/secondary/otie
name = "Otie"
icon_state = "otie"
body_zones = HEAD | CHEST | LEG_RIGHT | LEG_LEFT // | HAND_LEFT | HAND_RIGHT
body_zones = HEAD | CHEST | HAND_LEFT | HAND_RIGHT | LEG_RIGHT | LEG_LEFT

/datum/sprite_accessory/body_marking/secondary/sabresune
name = "Sabresune"
icon_state = "sabresune"
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | LEG_RIGHT | LEG_LEFT // | HAND_LEFT | HAND_RIGHT
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | HAND_LEFT | HAND_RIGHT | LEG_RIGHT | LEG_LEFT

/datum/sprite_accessory/body_marking/secondary/orca
name = "Orca"
Expand Down Expand Up @@ -145,17 +140,17 @@
/datum/sprite_accessory/body_marking/secondary/deer
name = "Deer"
icon_state = "deer"
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | LEG_RIGHT | LEG_LEFT // | HAND_LEFT | HAND_RIGHT
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | HAND_LEFT | HAND_RIGHT | LEG_RIGHT | LEG_LEFT

/datum/sprite_accessory/body_marking/secondary/hyena
name = "Hyena"
icon_state = "hyena"
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | LEG_RIGHT | LEG_LEFT // | HAND_LEFT | HAND_RIGHT
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | HAND_LEFT | HAND_RIGHT | LEG_RIGHT | LEG_LEFT

/datum/sprite_accessory/body_marking/secondary/dog
name = "Dog"
icon_state = "dog"
body_zones = CHEST | ARM_LEFT | ARM_RIGHT | LEG_RIGHT | LEG_LEFT // | HAND_LEFT | HAND_RIGHT
body_zones = CHEST | ARM_LEFT | ARM_RIGHT | HAND_LEFT | HAND_RIGHT | LEG_RIGHT | LEG_LEFT

/datum/sprite_accessory/body_marking/secondary/bat
name = "Bat"
Expand All @@ -170,17 +165,17 @@
/datum/sprite_accessory/body_marking/secondary/rat
name = "Rat Paw"
icon_state = "rat"
body_zones = ARM_LEFT | ARM_RIGHT | LEG_RIGHT | LEG_LEFT // | HAND_LEFT | HAND_RIGHT
body_zones = ARM_LEFT | ARM_RIGHT | HAND_LEFT | HAND_RIGHT | LEG_RIGHT | LEG_LEFT

/datum/sprite_accessory/body_marking/secondary/scolipede
name = "Scolipede"
icon_state = "scolipede"
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | LEG_RIGHT | LEG_LEFT // | HAND_LEFT | HAND_RIGHT
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | HAND_LEFT | HAND_RIGHT | LEG_RIGHT | LEG_LEFT

/datum/sprite_accessory/body_marking/secondary/guilmon
name = "Guilmon"
icon_state = "guilmon"
body_zones = CHEST | ARM_LEFT | ARM_RIGHT | LEG_RIGHT | LEG_LEFT // | HAND_LEFT | HAND_RIGHT
body_zones = CHEST | ARM_LEFT | ARM_RIGHT | HAND_LEFT | HAND_RIGHT | LEG_RIGHT | LEG_LEFT

/datum/sprite_accessory/body_marking/secondary/xeno
name = "Xeno"
Expand Down Expand Up @@ -220,22 +215,22 @@
/datum/sprite_accessory/body_marking/secondary/handsfeet
name = "Hands Feet"
icon_state = "handsfeet"
body_zones = LEG_RIGHT | LEG_LEFT // | HAND_LEFT | HAND_RIGHT
body_zones = HAND_LEFT | HAND_RIGHT | LEG_RIGHT | LEG_LEFT

/datum/sprite_accessory/body_marking/secondary/frog
name = "Frog"
icon_state = "frog"
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | LEG_RIGHT | LEG_LEFT // | HAND_LEFT | HAND_RIGHT
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | HAND_LEFT | HAND_RIGHT | LEG_RIGHT | LEG_LEFT

/datum/sprite_accessory/body_marking/secondary/bee
name = "Bee"
icon_state = "bee"
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | LEG_RIGHT | LEG_LEFT // | HAND_LEFT | HAND_RIGHT
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | HAND_LEFT | HAND_RIGHT | LEG_RIGHT | LEG_LEFT

/datum/sprite_accessory/body_marking/secondary/gradient
name = "Gradient"
icon_state = "gradient"
body_zones = ARM_LEFT | ARM_RIGHT | LEG_RIGHT | LEG_LEFT // | HAND_LEFT | HAND_RIGHT
body_zones = ARM_LEFT | ARM_RIGHT | HAND_LEFT | HAND_RIGHT | LEG_RIGHT | LEG_LEFT

/datum/sprite_accessory/body_marking/secondary/harlequin
name = "Harlequin"
Expand All @@ -245,9 +240,9 @@
/datum/sprite_accessory/body_marking/secondary/harlequin_reversed
name = "Harlequin Reversed"
icon_state = "harlequin_reversed"
body_zones = HEAD | CHEST | ARM_RIGHT | LEG_RIGHT // HAND_RIGHT
body_zones = HEAD | CHEST | ARM_RIGHT | HAND_RIGHT | LEG_RIGHT

/datum/sprite_accessory/body_marking/secondary/plain
name = "Plain"
icon_state = "plain"
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | LEG_RIGHT | LEG_LEFT // | HAND_LEFT | HAND_RIGHT
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | HAND_LEFT | HAND_RIGHT | LEG_RIGHT | LEG_LEFT
17 changes: 9 additions & 8 deletions modular_doppler/modular_customization/markings/body_markings/tertiary.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
/datum/sprite_accessory/body_marking/tertiary/fox
name = "Fox Sock"
icon_state = "fox"
body_zones = ARM_LEFT | ARM_RIGHT | LEG_RIGHT | LEG_LEFT // | HAND_LEFT | HAND_RIGHT
body_zones = ARM_LEFT | ARM_RIGHT | HAND_LEFT | HAND_RIGHT | LEG_RIGHT | LEG_LEFT

/datum/sprite_accessory/body_marking/tertiary/goat
name = "Goat Hoof"
icon_state = "goat"
body_zones = LEG_RIGHT | LEG_LEFT // | HAND_LEFT | HAND_RIGHT
body_zones = HAND_LEFT | HAND_RIGHT | LEG_RIGHT | LEG_LEFT

/datum/sprite_accessory/body_marking/tertiary/raccoon
name = "Raccoon Spot"
Expand All @@ -41,12 +41,12 @@
/datum/sprite_accessory/body_marking/tertiary/possum
name = "Possum Sock"
icon_state = "possum"
body_zones = LEG_RIGHT | LEG_LEFT // | HAND_LEFT | HAND_RIGHT
body_zones = HAND_LEFT | HAND_RIGHT | LEG_RIGHT | LEG_LEFT

/datum/sprite_accessory/body_marking/tertiary/tiger
name = "Tiger Stripe"
icon_state = "tiger"
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | LEG_RIGHT | LEG_LEFT // | HAND_LEFT | HAND_RIGHT
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | HAND_LEFT | HAND_RIGHT | LEG_RIGHT | LEG_LEFT

/datum/sprite_accessory/body_marking/tertiary/otter
name = "Otter Head"
Expand All @@ -56,7 +56,7 @@
/datum/sprite_accessory/body_marking/tertiary/otie
name = "Otie Spot"
icon_state = "otie"
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | LEG_RIGHT | LEG_LEFT // | HAND_LEFT | HAND_RIGHT
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | HAND_LEFT | HAND_RIGHT | LEG_RIGHT | LEG_LEFT

/datum/sprite_accessory/body_marking/tertiary/hawk
name = "Hawk Talon"
Expand All @@ -71,7 +71,7 @@
/datum/sprite_accessory/body_marking/tertiary/deer
name = "Deer Hoof"
icon_state = "deer"
body_zones = LEG_RIGHT | LEG_LEFT // | HAND_LEFT | HAND_RIGHT
body_zones = HAND_LEFT | HAND_RIGHT | LEG_RIGHT | LEG_LEFT

/datum/sprite_accessory/body_marking/tertiary/hyena
name = "Hyena Side"
Expand All @@ -91,7 +91,7 @@
/datum/sprite_accessory/body_marking/tertiary/floofer
name = "Floofer Sock"
icon_state = "floofer"
body_zones = ARM_LEFT | ARM_RIGHT | LEG_RIGHT | LEG_LEFT // | HAND_LEFT | HAND_RIGHT
body_zones = ARM_LEFT | ARM_RIGHT | LEG_RIGHT | LEG_LEFT | HAND_LEFT | HAND_RIGHT

/datum/sprite_accessory/body_marking/tertiary/rat
name = "Rat Spot"
Expand All @@ -111,7 +111,7 @@
/datum/sprite_accessory/body_marking/tertiary/guilmon
name = "Guilmon Mark"
icon_state = "guilmon"
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | LEG_RIGHT | LEG_LEFT // | HAND_LEFT | HAND_RIGHT
body_zones = HEAD | CHEST | ARM_LEFT | ARM_RIGHT | HAND_LEFT | HAND_RIGHT | LEG_RIGHT | LEG_LEFT

/datum/sprite_accessory/body_marking/tertiary/xeno
name = "Xeno Head"
Expand All @@ -132,3 +132,4 @@
name = "Light Belly"
icon_state = "lbelly"
body_zones = CHEST

Binary file modified modular_doppler/modular_customization/markings/icons/markings/other_markings.dmi
View file
Binary file not shown.
Binary file modified modular_doppler/modular_customization/markings/icons/markings/secondary_markings.dmi
View file
Binary file not shown.
Loading

0 comments on commit 1f6e454

Please sign in to comment.