From 586966ea513e4901b240667446b55b40bb42c34d Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Thu, 16 Apr 2020 03:37:52 +0200
Subject: [PATCH 01/63] General refactor for some snowflake bodyparts procs and
taurs.
---
code/__DEFINES/inventory.dm | 3 +
code/__DEFINES/misc.dm | 18 +-
code/_globalvars/lists/flavor_misc.dm | 6 +-
code/modules/client/preferences_savefile.dm | 9 +
code/modules/clothing/clothing.dm | 37 ++-
.../sprite_accessories/_sprite_accessories.dm | 20 ++
.../sprite_accessories/alienpeople.dm | 7 +
.../sprite_accessories/body_markings.dm | 5 +
.../new_player/sprite_accessories/caps.dm | 3 +-
.../new_player/sprite_accessories/ears.dm | 8 +-
.../new_player/sprite_accessories/frills.dm | 4 +-
.../new_player/sprite_accessories/horns.dm | 4 +-
.../sprite_accessories/ipc_synths.dm | 1 +
.../sprite_accessories/legs_and_taurs.dm | 72 +++--
.../new_player/sprite_accessories/pines.dm | 1 +
.../new_player/sprite_accessories/snouts.dm | 3 +
.../new_player/sprite_accessories/tails.dm | 13 +-
.../new_player/sprite_accessories/wings.dm | 11 +-
.../mob/living/carbon/human/species.dm | 248 ++++++++----------
.../mob/living/carbon/human/update_icons.dm | 62 +++--
.../modules/mob/living/carbon/update_icons.dm | 9 +
icons/mob/clothing/taur_hooved.dmi | Bin 8069 -> 8023 bytes
modular_citadel/icons/mob/mam_taur.dmi | Bin 52417 -> 57807 bytes
23 files changed, 324 insertions(+), 220 deletions(-)
diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm
index fd50b8b70d..92cee59860 100644
--- a/code/__DEFINES/inventory.dm
+++ b/code/__DEFINES/inventory.dm
@@ -139,6 +139,9 @@
#define STYLE_PAW_TAURIC (1<<3)
#define STYLE_HOOF_TAURIC (1<<4)
#define STYLE_ALL_TAURIC (STYLE_SNEK_TAURIC|STYLE_PAW_TAURIC|STYLE_HOOF_TAURIC)
+#define USE_SNEK_CLIP_MASK (1<<5)
+#define USE_HOOF_CLIP_MASK (1<<6)
+#define USE_TAUR_CLIP_MASK (USE_SNEK_CLIP_MASK|USE_HOOF_CLIP_MASK)
//digitigrade legs settings.
#define NOT_DIGITIGRADE 0
diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm
index 3fb149d071..e8ca6f444c 100644
--- a/code/__DEFINES/misc.dm
+++ b/code/__DEFINES/misc.dm
@@ -35,15 +35,15 @@ Will print: "/mob/living/carbon/human/death" (you can optionally embed it in a s
#define BODY_ADJ_LAYER 27 //certain mutantrace features (snout, body markings) that must appear above the body parts
#define GENITALS_FRONT_LAYER 26 //Draws some genitalia above clothes and the TAUR body if need be.
#define BODY_LAYER 25 //underwear, undershirts, socks, eyes, lips(makeup)
-#define FRONT_MUTATIONS_LAYER 24 //mutations that should appear above body, body_adj and bodyparts layer (e.g. laser eyes)
-#define DAMAGE_LAYER 23 //damage indicators (cuts and burns)
-#define UNIFORM_LAYER 22
-#define ID_LAYER 21
-#define HANDS_PART_LAYER 20
-#define SHOES_LAYER 19
-#define GLOVES_LAYER 18
-#define EARS_LAYER 17
-#define BODY_TAUR_LAYER 16
+#define BODY_ADJ_UPPER_LAYER 24
+#define FRONT_MUTATIONS_LAYER 23 //mutations that should appear above body, body_adj and bodyparts layer (e.g. laser eyes)
+#define DAMAGE_LAYER 22 //damage indicators (cuts and burns)
+#define UNIFORM_LAYER 21
+#define ID_LAYER 20
+#define HANDS_PART_LAYER 19
+#define SHOES_LAYER 18
+#define GLOVES_LAYER 17
+#define EARS_LAYER 16
#define SUIT_LAYER 15
#define GENITALS_EXPOSED_LAYER 14
#define GLASSES_LAYER 13
diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm
index 968995e81d..ed037968ef 100644
--- a/code/_globalvars/lists/flavor_misc.dm
+++ b/code/_globalvars/lists/flavor_misc.dm
@@ -137,8 +137,10 @@ GLOBAL_LIST_INIT(jumpsuitlist, list(PREF_SUIT, PREF_SKIRT))
#define UPLINK_PEN "Pen" //like a real spy!
GLOBAL_LIST_INIT(uplink_spawn_loc_list, list(UPLINK_PDA, UPLINK_RADIO, UPLINK_PEN))
- //Female Uniforms
-GLOBAL_LIST_EMPTY(female_clothing_icons)
+//List of alpha masked cached icons.
+GLOBAL_LIST_EMPTY(alpha_masked_worn_clothing_icons)
+//List containing alpha mask /icons in a 'state = list(icon, offset_x, offset_y)'
+GLOBAL_LIST_EMPTY(worn_alpha_masks)
//radical shit
GLOBAL_LIST_INIT(hit_appends, list("-OOF", "-ACK", "-UGH", "-HRNK", "-HURGH", "-GLORF"))
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 7da9d5a1dc..78f6f52ee7 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -159,6 +159,15 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
features["cock_shape"] = malformed_hockeys[hockey]
features["cock_taur"] = TRUE
+ if(current_version < 29)
+ switch(features["taur"])
+ if("Husky", "Lab", "Shepherd", "Fox", "Wolf")
+ features["taur"] = "Canine"
+ if("Panther", "Tiger")
+ features["taur"] = "Feline"
+ if("Cow")
+ features["taur"] = "Cow (Spotted)"
+
/datum/preferences/proc/load_path(ckey,filename="preferences.sav")
if(!ckey)
return
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index d484027ad5..2fd52ed048 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -173,12 +173,37 @@ SEE_PIXELS// if an object is located on an unlit area, but some of its pixels ar
BLIND // can't see anything
*/
-/proc/generate_female_clothing(index,t_color,icon,type)
- var/icon/female_clothing_icon = icon("icon"=icon, "icon_state"=t_color)
- var/icon/female_s = icon("icon"='icons/mob/clothing/uniform.dmi', "icon_state"="[(type == FEMALE_UNIFORM_FULL) ? "female_full" : "female_top"]")
- female_clothing_icon.Blend(female_s, ICON_MULTIPLY)
- female_clothing_icon = fcopy_rsc(female_clothing_icon)
- GLOB.female_clothing_icons[index] = female_clothing_icon
+#if DM_VERSION >= 513 // Yes! Filters!
+
+/proc/generate_alpha_masked_clothing(index,state,icon,layer,female,alpha_masks)
+ var/mutable_appearance/M = mutable_appearance(icon, state, layer = layer)
+ if(female)
+ var/icon/female_s = icon('icons/mob/clothing/uniform.dmi', "[(female == FEMALE_UNIFORM_FULL) ? "female_full" : "female_top"]")
+ M.filters += filter(type="alpha",icon = female_s)
+ if(alpha_masks)
+ if(istext(alpha_masks))
+ alpha_masks = list(alpha_masks)
+ for(var/k in alpha_masks)
+ var/list/L = GLOB.worn_alpha_masks[k]
+ M.filters += filter(type="alpha", x = L[1], y = L[2], icon = L[3])
+ . = GLOB.alpha_masked_worn_clothing_icons[index] = M
+
+#else
+
+/proc/generate_alpha_masked_clothing(index,state,icon,layer,female,alpha_masks)
+ var/icon/I = icon(icon, state)
+ if(female)
+ var/icon/female_s = icon('icons/mob/clothing/uniform.dmi', "[(female == FEMALE_UNIFORM_FULL) ? "female_full" : "female_top"]")
+ I.Blend(female_s, ICON_MULTIPLY)
+ if(alpha_masks)
+ if(istext(alpha_masks))
+ alpha_masks = list(alpha_masks)
+ for(var/k in alpha_masks)
+ var/list/L = GLOB.worn_alpha_masks[k]
+ I.Blend(L[3], ICON_MULTIPLY, L[1], L[2])
+ GLOB.alpha_masked_worn_clothing_icons[index] = fcopy_rsc(I)
+
+#endif
/obj/item/clothing/proc/weldingvisortoggle(mob/user) //proc to toggle welding visors on helmets, masks, goggles, etc.
if(!can_use(user))
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm b/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm
index ab278b2e82..7b383d22b5 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm
@@ -16,6 +16,7 @@
from doing this unless you absolutely know what you are doing, and have defined a
conversion in savefile.dm
*/
+
/proc/init_sprite_accessory_subtypes(prototype, list/L, list/male, list/female, roundstart = FALSE, skip_prototype = TRUE)//Roundstart argument builds a specific list for roundstart parts where some parts may be locked
if(!istype(L))
L = list()
@@ -60,6 +61,9 @@
var/dimension_x = 32
var/dimension_y = 32
var/center = FALSE //Should we center the sprite?
+ var/list/relevant_layers //list of layers that this accessory uses. As of now only used in species.handle_mutant_bodyparts(), but that's where most sprite accessories are anyway.
+ var/mutant_part_string //Also used in species.handle_mutant_bodyparts() to generate the overlay icon state.
+ var/alpha_mask_state
//Special / holdover traits for Citadel specific sprites.
var/extra = FALSE
@@ -75,6 +79,22 @@
//For soft-restricting markings to species IDs
var/list/recommended_species
+/datum/sprite_accessory/New()
+ if(alpha_mask_state)
+ alpha_mask_state = "[icon]-[alpha_mask_state]" //foolproofing against states with same name but different files.
+ if(!GLOB.worn_alpha_masks[alpha_mask_state])
+ var/image/I = icon(icon, alpha_mask_state)
+ var/x_offset = 0
+ var/y_offset = 0
+ if(center)
+ x_offset = -((dimension_x/world.icon_size)-1)*(world.icon_size*0.5)
+ y_offset = -((dimension_y/world.icon_size)-1)*(world.icon_size*0.5)
+ if(dimension_x < world.icon_size)
+ x_offset *= -1
+ if(dimension_y < world.icon_size)
+ y_offset *= -1
+ GLOB.worn_alpha_masks[alpha_mask_state] = list(x_offset, y_offset, I)
+
/datum/sprite_accessory/underwear
icon = 'icons/mob/clothing/underwear.dmi'
var/has_color = FALSE
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/alienpeople.dm b/code/modules/mob/dead/new_player/sprite_accessories/alienpeople.dm
index 6c0659f851..c8e7aca26d 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/alienpeople.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/alienpeople.dm
@@ -4,6 +4,8 @@
*******************************************/
/datum/sprite_accessory/xeno_dorsal
icon = 'modular_citadel/icons/mob/xeno_parts_greyscale.dmi'
+ mutant_part_string = "xenodorsal"
+ relevant_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER)
/datum/sprite_accessory/xeno_dorsal/standard
name = "Standard"
@@ -22,9 +24,12 @@
*******************************************/
/datum/sprite_accessory/xeno_tail
icon = 'modular_citadel/icons/mob/xeno_parts_greyscale.dmi'
+ mutant_part_string = "tail"
+ relevant_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER)
/datum/sprite_accessory/xeno_tail/none
name = "None"
+ relevant_layers = null
/datum/sprite_accessory/xeno_tail/standard
name = "Xenomorph Tail"
@@ -35,6 +40,8 @@
*******************************************/
/datum/sprite_accessory/xeno_head
icon = 'modular_citadel/icons/mob/xeno_parts_greyscale.dmi'
+ mutant_part_string = "xhead"
+ relevant_layers = list(BODY_ADJ_LAYER)
/datum/sprite_accessory/xeno_head/standard
name = "Standard"
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm b/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm
index 8f043125b2..9950f0d76a 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm
@@ -4,10 +4,12 @@
/datum/sprite_accessory/body_markings
icon = 'icons/mob/mutant_bodyparts.dmi'
+ relevant_layers = list(BODY_ADJ_LAYER)
/datum/sprite_accessory/body_markings/none
name = "None"
icon_state = "none"
+ relevant_layers = null
/datum/sprite_accessory/body_markings/dtiger
name = "Dark Tiger Body"
@@ -45,6 +47,7 @@
icon_state = "none"
ckeys_allowed = list("yousshouldnteverbeseeingthisyoumeme")
icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
+ relevant_layers = null
/datum/sprite_accessory/mam_body_markings/plain
name = "Plain"
@@ -219,10 +222,12 @@
/datum/sprite_accessory/insect_fluff
icon = 'icons/mob/wings.dmi'
color_src = 0
+ relevant_layers = list(BODY_FRONT_LAYER)
/datum/sprite_accessory/insect_fluff/none
name = "None"
icon_state = "none"
+ relevant_layers = null
/datum/sprite_accessory/insect_fluff/plain
name = "Plain"
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/caps.dm b/code/modules/mob/dead/new_player/sprite_accessories/caps.dm
index debb4865ba..822fcf960d 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/caps.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/caps.dm
@@ -1,7 +1,8 @@
datum/sprite_accessory/caps
icon = 'icons/mob/mutant_bodyparts.dmi'
color_src = HAIR
+ relevant_layers = list(BODY_ADJ_LAYER)
/datum/sprite_accessory/caps/round
name = "Round"
- icon_state = "round"
\ No newline at end of file
+ icon_state = "round"
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/ears.dm b/code/modules/mob/dead/new_player/sprite_accessories/ears.dm
index c91bd633a5..c60abbeefa 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/ears.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/ears.dm
@@ -1,9 +1,12 @@
/datum/sprite_accessory/ears
icon = 'icons/mob/mutant_bodyparts.dmi'
+ mutant_part_string = "ears"
+ relevant_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER, BODY_FRONT_LAYER)
/datum/sprite_accessory/ears/none
name = "None"
icon_state = "none"
+ relevant_layers = null
/******************************************
*************** Human Ears ****************
@@ -172,10 +175,13 @@
/datum/sprite_accessory/mam_ears
icon = 'modular_citadel/icons/mob/mam_ears.dmi'
color_src = MATRIXED
+ mutant_part_string = "ears"
+ relevant_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER, BODY_FRONT_LAYER)
/datum/sprite_accessory/mam_ears/none
name = "None"
icon_state = "none"
+ relevant_layers = null
/datum/sprite_accessory/mam_ears/axolotl
name = "Axolotl"
@@ -309,4 +315,4 @@
/datum/sprite_accessory/mam_ears/bunny
name = "Bunny"
- icon_state = "bunny"
\ No newline at end of file
+ icon_state = "bunny"
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/frills.dm b/code/modules/mob/dead/new_player/sprite_accessories/frills.dm
index 93c4af6df0..0aaec309a4 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/frills.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/frills.dm
@@ -1,9 +1,11 @@
/datum/sprite_accessory/frills
icon = 'icons/mob/mutant_bodyparts.dmi'
+ relevant_layers = list(BODY_ADJ_LAYER)
/datum/sprite_accessory/frills/none
name = "None"
icon_state = "none"
+ relevant_layers = null
/datum/sprite_accessory/frills/simple
name = "Simple"
@@ -15,4 +17,4 @@
/datum/sprite_accessory/frills/aquatic
name = "Aquatic"
- icon_state = "aqua"
\ No newline at end of file
+ icon_state = "aqua"
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/horns.dm b/code/modules/mob/dead/new_player/sprite_accessories/horns.dm
index a630ead7b3..6126b6c04b 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/horns.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/horns.dm
@@ -1,10 +1,12 @@
/datum/sprite_accessory/horns
icon = 'icons/mob/mutant_bodyparts.dmi'
color_src = HORNCOLOR
+ relevant_layers = list(BODY_ADJ_LAYER)
/datum/sprite_accessory/horns/none
name = "None"
icon_state = "none"
+ relevant_layers = null
/datum/sprite_accessory/horns/simple
name = "Simple"
@@ -33,4 +35,4 @@
/datum/sprite_accessory/horns/guilmon
name = "Guilmon"
- icon_state = "guilmon"
\ No newline at end of file
+ icon_state = "guilmon"
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/ipc_synths.dm b/code/modules/mob/dead/new_player/sprite_accessories/ipc_synths.dm
index d47607f6fd..e38d9b7341 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/ipc_synths.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/ipc_synths.dm
@@ -5,6 +5,7 @@
/datum/sprite_accessory/screen
icon = 'modular_citadel/icons/mob/ipc_screens.dmi'
color_src = null
+ relevant_layers = list(BODY_ADJ_LAYER)
/datum/sprite_accessory/screen/blank
name = "Blank"
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm b/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm
index fe154ffeec..3aec01d557 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm
@@ -22,28 +22,38 @@
/datum/sprite_accessory/taur
icon = 'modular_citadel/icons/mob/mam_taur.dmi'
extra_icon = 'modular_citadel/icons/mob/mam_taur.dmi'
- extra = TRUE
extra2_icon = 'modular_citadel/icons/mob/mam_taur.dmi'
- extra2 = TRUE
center = TRUE
dimension_x = 64
- var/taur_mode = NONE //Must be a single specific tauric suit variation bitflag. Don't do FLAG_1|FLAG_2
- var/alt_taur_mode = NONE //Same as above.
color_src = MATRIXED
recommended_species = list("human", "lizard", "insect", "mammal", "xeno", "jelly", "slimeperson", "podweak")
+ relevant_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_UPPER_LAYER, BODY_FRONT_LAYER)
+ var/taur_mode = NONE //Must be a single specific tauric suit variation bitflag. Don't do FLAG_1|FLAG_2
+ var/alt_taur_mode = NONE //Same as above.
+ var/hide_legs = USE_HOOF_CLIP_MASK
+ alpha_mask_state = "taur_mask_def"
+
/datum/sprite_accessory/taur/none
- dimension_x = 32
- center = FALSE
name = "None"
icon_state = "None"
+ dimension_x = 32
+ center = FALSE
recommended_species = null
+ relevant_layers = null
+ hide_legs = FALSE
/datum/sprite_accessory/taur/cow
name = "Cow"
icon_state = "cow"
taur_mode = STYLE_HOOF_TAURIC
alt_taur_mode = STYLE_PAW_TAURIC
+ color_src = MUTCOLORS
+
+/datum/sprite_accessory/taur/cow/spotted
+ name = "Cow (Spotted)"
+ icon_state = "cow_spotted"
+ color_src = MATRIXED
/datum/sprite_accessory/taur/deer
name = "Deer"
@@ -56,27 +66,21 @@
name = "Drake"
icon_state = "drake"
taur_mode = STYLE_PAW_TAURIC
+ color_src = MUTCOLORS
+ extra = TRUE
/datum/sprite_accessory/taur/drider
name = "Drider"
icon_state = "drider"
color_src = MUTCOLORS
+ extra = TRUE
/datum/sprite_accessory/taur/eevee
name = "Eevee"
icon_state = "eevee"
taur_mode = STYLE_PAW_TAURIC
color_src = MUTCOLORS
-
-/datum/sprite_accessory/taur/fox
- name = "Fox"
- icon_state = "fox"
- taur_mode = STYLE_PAW_TAURIC
-
-/datum/sprite_accessory/taur/husky
- name = "Husky"
- icon_state = "husky"
- taur_mode = STYLE_PAW_TAURIC
+ extra = TRUE
/datum/sprite_accessory/taur/horse
name = "Horse"
@@ -84,15 +88,12 @@
taur_mode = STYLE_HOOF_TAURIC
alt_taur_mode = STYLE_PAW_TAURIC
-/datum/sprite_accessory/taur/lab
- name = "Lab"
- icon_state = "lab"
- taur_mode = STYLE_PAW_TAURIC
-
/datum/sprite_accessory/taur/naga
name = "Naga"
icon_state = "naga"
taur_mode = STYLE_SNEK_TAURIC
+ hide_legs = USE_SNEK_CLIP_MASK
+ alpha_mask_state = "taur_mask_naga"
/datum/sprite_accessory/taur/otie
name = "Otie"
@@ -104,29 +105,26 @@
icon_state = "pede"
taur_mode = STYLE_PAW_TAURIC
color_src = MUTCOLORS
-
-/datum/sprite_accessory/taur/panther
- name = "Panther"
- icon_state = "panther"
- taur_mode = STYLE_PAW_TAURIC
-
-/datum/sprite_accessory/taur/shepherd
- name = "Shepherd"
- icon_state = "shepherd"
- taur_mode = STYLE_PAW_TAURIC
+ extra = TRUE
+ extra2 = TRUE
/datum/sprite_accessory/taur/tentacle
name = "Tentacle"
icon_state = "tentacle"
taur_mode = STYLE_SNEK_TAURIC
color_src = MUTCOLORS
+ hide_legs = USE_SNEK_CLIP_MASK
-/datum/sprite_accessory/taur/tiger
- name = "Tiger"
- icon_state = "tiger"
+/datum/sprite_accessory/taur/canine
+ name = "Canine"
+ icon_state = "canine"
taur_mode = STYLE_PAW_TAURIC
+ color_src = MUTCOLORS
+ extra = TRUE
-/datum/sprite_accessory/taur/wolf
- name = "Wolf"
- icon_state = "wolf"
+/datum/sprite_accessory/taur/feline
+ name = "Feline"
+ icon_state = "feline"
taur_mode = STYLE_PAW_TAURIC
+ color_src = MUTCOLORS
+ extra = TRUE
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/pines.dm b/code/modules/mob/dead/new_player/sprite_accessories/pines.dm
index 4ccbc3d9ea..0885a6eb9f 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/pines.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/pines.dm
@@ -7,6 +7,7 @@
/datum/sprite_accessory/spines/none
name = "None"
icon_state = "none"
+ relevant_layers = null
/datum/sprite_accessory/spines_animated/none
name = "None"
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm b/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm
index c016e9b119..61763e21ee 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm
@@ -1,5 +1,6 @@
/datum/sprite_accessory/snouts
icon = 'icons/mob/mutant_bodyparts.dmi'
+ mutant_part_string = "snout"
/datum/sprite_accessory/snouts/sharp
name = "Sharp"
@@ -152,11 +153,13 @@
color_src = MATRIXED
icon = 'modular_citadel/icons/mob/mam_snouts.dmi'
recommended_species = list("mammal", "slimeperson", "insect", "podweak")
+ mutant_part_string = "snout"
/datum/sprite_accessory/mam_snouts/none
name = "None"
icon_state = "none"
recommended_species = null
+ relevant_layers = null
/datum/sprite_accessory/mam_snouts/bird
name = "Beak"
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/tails.dm b/code/modules/mob/dead/new_player/sprite_accessories/tails.dm
index 90980743e1..a48df5e41e 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/tails.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/tails.dm
@@ -1,8 +1,10 @@
/datum/sprite_accessory/tails
icon = 'icons/mob/mutant_bodyparts.dmi'
+ mutant_part_string = "tail"
/datum/sprite_accessory/tails_animated
icon = 'icons/mob/mutant_bodyparts.dmi'
+ mutant_part_string = "tailwag"
/******************************************
************* Lizard Tails ****************
@@ -43,10 +45,12 @@
/datum/sprite_accessory/tails/lizard/none
name = "None"
icon_state = "None"
+ relevant_layers = null
/datum/sprite_accessory/tails_animated/lizard/none
name = "None"
icon_state = "None"
+ relevant_layers = null
/datum/sprite_accessory/tails/lizard/axolotl
name = "Axolotl"
@@ -85,10 +89,12 @@
/datum/sprite_accessory/tails/human/none
name = "None"
icon_state = "none"
+ relevant_layers = null
/datum/sprite_accessory/tails_animated/human/none
name = "None"
icon_state = "none"
+ relevant_layers = null
/datum/sprite_accessory/tails/human/ailurus
name = "Red Panda"
@@ -502,20 +508,23 @@
color_src = MATRIXED
icon = 'modular_citadel/icons/mob/mam_tails.dmi'
recommended_species = list("mammal", "slimeperson", "podweak", "felinid", "insect")
+ mutant_part_string = "tail"
/datum/sprite_accessory/mam_tails/none
name = "None"
icon_state = "none"
recommended_species = null
+ relevant_layers = null
/datum/sprite_accessory/mam_tails_animated
color_src = MATRIXED
icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+ mutant_part_string = "tail"
/datum/sprite_accessory/mam_tails_animated/none
name = "None"
icon_state = "none"
- color_src = MATRIXED
+ relevant_layers = null
/datum/sprite_accessory/mam_tails/ailurus
name = "Red Panda"
@@ -576,7 +585,7 @@
/datum/sprite_accessory/mam_tails_animated/catbig
name = "Cat, Big"
icon_state = "catbig"
-
+
/datum/sprite_accessory/mam_tails/twocat
name = "Cat, Double"
icon_state = "twocat"
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/wings.dm b/code/modules/mob/dead/new_player/sprite_accessories/wings.dm
index 9c1eb6a3fa..2b25fe8848 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/wings.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/wings.dm
@@ -3,6 +3,7 @@
/datum/sprite_accessory/wings/none
name = "None"
icon_state = "none"
+ relevant_layers = null
/datum/sprite_accessory/wings_open
icon = 'icons/mob/wings.dmi'
@@ -17,6 +18,7 @@
/datum/sprite_accessory/wings
icon = 'icons/mob/wings.dmi'
+ relevant_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER, BODY_FRONT_LAYER)
/datum/sprite_accessory/wings/angel
name = "Angel"
@@ -32,10 +34,13 @@
/datum/sprite_accessory/deco_wings
icon = 'icons/mob/wings.dmi'
color_src = WINGCOLOR
+ mutant_part_string = "insect_wings"
+ relevant_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER)
/datum/sprite_accessory/deco_wings/none
name = "None"
icon_state = "none"
+ relevant_layers = null
/datum/sprite_accessory/deco_wings/angel
name = "Angel"
@@ -130,10 +135,12 @@
/datum/sprite_accessory/insect_wings
icon = 'icons/mob/wings.dmi'
color_src = WINGCOLOR
+ relevant_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER)
/datum/sprite_accessory/insect_wings/none
name = "None"
icon_state = "none"
+ relevant_layers = null
/datum/sprite_accessory/insect_wings/bat
name = "Bat"
@@ -231,10 +238,12 @@
/datum/sprite_accessory/insect_markings // Extra markings for insects ported from tg.
icon = 'icons/mob/insect_markings.dmi'
color_src = null
+ relevant_layers = list(BODY_ADJ_LAYER)
/datum/sprite_accessory/insect_markings/none
name = "None"
icon_state = "none"
+ relevant_layers = null
/datum/sprite_accessory/insect_markings/reddish
name = "Reddish"
@@ -290,4 +299,4 @@
/datum/sprite_accessory/insect_markings/witchwing
name = "Witch Wing"
- icon_state = "witchwing"
\ No newline at end of file
+ icon_state = "witchwing"
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index e39ce7d488..d1b408444c 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -582,7 +582,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
var/state = "[T.icon_state][((DIGITIGRADE in species_traits) && T.has_digitigrade) ? "_d" : ""]"
var/mutable_appearance/MA
if(H.dna.species.sexes && H.dna.features["body_model"] == FEMALE)
- MA = wear_female_version(state, T.icon, BODY_LAYER)
+ MA = wear_alpha_masked_version(state, T.icon, -BODY_LAYER, FEMALE_UNIFORM_TOP)
else
MA = mutable_appearance(T.icon, state, -BODY_LAYER)
if(T.has_color)
@@ -597,15 +597,14 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
/datum/species/proc/handle_mutant_bodyparts(mob/living/carbon/human/H, forced_colour)
var/list/bodyparts_to_add = mutant_bodyparts.Copy()
- var/list/relevent_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER, BODY_FRONT_LAYER, BODY_TAUR_LAYER)
+ var/list/relevant_layers = list()
+ var/list/dna_feature_as_text_string = list()
var/list/standing = list()
H.remove_overlay(BODY_BEHIND_LAYER)
H.remove_overlay(BODY_ADJ_LAYER)
+ H.remove_overlay(BODY_ADJ_UPPER_LAYER)
H.remove_overlay(BODY_FRONT_LAYER)
- //CITADEL EDIT - Do not forget to add this to relevent_layers list just above too!
- H.remove_overlay(BODY_TAUR_LAYER)
- //END EDIT
if(!mutant_bodyparts)
return
@@ -742,113 +741,110 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
if(!bodyparts_to_add)
return
+ for(var/bodypart in bodyparts_to_add)
+ var/datum/sprite_accessory/S
+ switch(bodypart)
+ if("tail_lizard")
+ S = GLOB.tails_list_lizard[H.dna.features["tail_lizard"]]
+ if("waggingtail_lizard")
+ S = GLOB.animated_tails_list_lizard[H.dna.features["tail_lizard"]]
+ if("tail_human")
+ S = GLOB.tails_list_human[H.dna.features["tail_human"]]
+ if("waggingtail_human")
+ S = GLOB.animated_tails_list_human[H.dna.features["tail_human"]]
+ if("spines")
+ S = GLOB.spines_list[H.dna.features["spines"]]
+ if("waggingspines")
+ S = GLOB.animated_spines_list[H.dna.features["spines"]]
+ if("snout")
+ S = GLOB.snouts_list[H.dna.features["snout"]]
+ if("frills")
+ S = GLOB.frills_list[H.dna.features["frills"]]
+ if("horns")
+ S = GLOB.horns_list[H.dna.features["horns"]]
+ if("ears")
+ S = GLOB.ears_list[H.dna.features["ears"]]
+ if("body_markings")
+ S = GLOB.body_markings_list[H.dna.features["body_markings"]]
+ if("wings")
+ S = GLOB.wings_list[H.dna.features["wings"]]
+ if("wingsopen")
+ S = GLOB.wings_open_list[H.dna.features["wings"]]
+ if("deco_wings")
+ S = GLOB.deco_wings_list[H.dna.features["deco_wings"]]
+ if("legs")
+ S = GLOB.legs_list[H.dna.features["legs"]]
+ if("insect_wings")
+ S = GLOB.insect_wings_list[H.dna.features["insect_wings"]]
+ if("insect_fluff")
+ S = GLOB.insect_fluffs_list[H.dna.features["insect_fluff"]]
+ if("insect_markings")
+ S = GLOB.insect_markings_list[H.dna.features["insect_markings"]]
+ if("caps")
+ S = GLOB.caps_list[H.dna.features["caps"]]
+ if("ipc_screen")
+ S = GLOB.ipc_screens_list[H.dna.features["ipc_screen"]]
+ if("ipc_antenna")
+ S = GLOB.ipc_antennas_list[H.dna.features["ipc_antenna"]]
+ if("mam_tail")
+ S = GLOB.mam_tails_list[H.dna.features["mam_tail"]]
+ if("mam_waggingtail")
+ S = GLOB.mam_tails_animated_list[H.dna.features["mam_tail"]]
+ if("mam_body_markings")
+ S = GLOB.mam_body_markings_list[H.dna.features["mam_body_markings"]]
+ if("mam_ears")
+ S = GLOB.mam_ears_list[H.dna.features["mam_ears"]]
+ if("mam_snouts")
+ S = GLOB.mam_snouts_list[H.dna.features["mam_snouts"]]
+ if("taur")
+ S = GLOB.taur_list[H.dna.features["taur"]]
+ if("xenodorsal")
+ S = GLOB.xeno_dorsal_list[H.dna.features["xenodorsal"]]
+ if("xenohead")
+ S = GLOB.xeno_head_list[H.dna.features["xenohead"]]
+ if("xenotail")
+ S = GLOB.xeno_tail_list[H.dna.features["xenotail"]]
+
+ if(!S || S.icon_state == "none")
+ continue
+
+ for(var/L in S.relevant_layers)
+ LAZYADD(relevant_layers["[L]"], S)
+ if(!S.mutant_part_string)
+ dna_feature_as_text_string[S] = bodypart
+
+ var/static/list/layer_text = list("[BODY_BEHIND_LAYER]" = "_BEHIND", "[BODY_ADJ_LAYER]" = "_ADJ", \
+ "[BODY_ADJ_UPPER_LAYER]" = "_ADJUP", "[BODY_FRONT_LAYER]" = "_FRONT")
+
var/g = (H.dna.features["body_model"] == FEMALE) ? "f" : "m"
+ var/list/colorlist = list()
+ var/husk = HAS_TRAIT(H, TRAIT_HUSK)
+ colorlist += husk ? ReadRGB("#a3a3a3") :ReadRGB("[H.dna.features["mcolor"]]0")
+ colorlist += husk ? ReadRGB("#a3a3a3") :ReadRGB("[H.dna.features["mcolor2"]]0")
+ colorlist += husk ? ReadRGB("#a3a3a3") : ReadRGB("[H.dna.features["mcolor3"]]0")
+ colorlist += list(0,0,0, hair_alpha)
+ for(var/index in 1 to colorlist.len)
+ colorlist[index] /= 255
- for(var/layer in relevent_layers)
- var/layertext = mutant_bodyparts_layertext(layer)
-
- for(var/bodypart in bodyparts_to_add)
- var/datum/sprite_accessory/S
- switch(bodypart)
- if("tail_lizard")
- S = GLOB.tails_list_lizard[H.dna.features["tail_lizard"]]
- if("waggingtail_lizard")
- S = GLOB.animated_tails_list_lizard[H.dna.features["tail_lizard"]]
- if("tail_human")
- S = GLOB.tails_list_human[H.dna.features["tail_human"]]
- if("waggingtail_human")
- S = GLOB.animated_tails_list_human[H.dna.features["tail_human"]]
- if("spines")
- S = GLOB.spines_list[H.dna.features["spines"]]
- if("waggingspines")
- S = GLOB.animated_spines_list[H.dna.features["spines"]]
- if("snout")
- S = GLOB.snouts_list[H.dna.features["snout"]]
- if("frills")
- S = GLOB.frills_list[H.dna.features["frills"]]
- if("horns")
- S = GLOB.horns_list[H.dna.features["horns"]]
- if("ears")
- S = GLOB.ears_list[H.dna.features["ears"]]
- if("body_markings")
- S = GLOB.body_markings_list[H.dna.features["body_markings"]]
- if("wings")
- S = GLOB.wings_list[H.dna.features["wings"]]
- if("wingsopen")
- S = GLOB.wings_open_list[H.dna.features["wings"]]
- if("deco_wings")
- S = GLOB.deco_wings_list[H.dna.features["deco_wings"]]
- if("legs")
- S = GLOB.legs_list[H.dna.features["legs"]]
- if("insect_wings")
- S = GLOB.insect_wings_list[H.dna.features["insect_wings"]]
- if("insect_fluff")
- S = GLOB.insect_fluffs_list[H.dna.features["insect_fluff"]]
- if("insect_markings")
- S = GLOB.insect_markings_list[H.dna.features["insect_markings"]]
- if("caps")
- S = GLOB.caps_list[H.dna.features["caps"]]
- if("ipc_screen")
- S = GLOB.ipc_screens_list[H.dna.features["ipc_screen"]]
- if("ipc_antenna")
- S = GLOB.ipc_antennas_list[H.dna.features["ipc_antenna"]]
- if("mam_tail")
- S = GLOB.mam_tails_list[H.dna.features["mam_tail"]]
- if("mam_waggingtail")
- S = GLOB.mam_tails_animated_list[H.dna.features["mam_tail"]]
- if("mam_body_markings")
- S = GLOB.mam_body_markings_list[H.dna.features["mam_body_markings"]]
- if("mam_ears")
- S = GLOB.mam_ears_list[H.dna.features["mam_ears"]]
- if("mam_snouts")
- S = GLOB.mam_snouts_list[H.dna.features["mam_snouts"]]
- if("taur")
- S = GLOB.taur_list[H.dna.features["taur"]]
- if("xenodorsal")
- S = GLOB.xeno_dorsal_list[H.dna.features["xenodorsal"]]
- if("xenohead")
- S = GLOB.xeno_head_list[H.dna.features["xenohead"]]
- if("xenotail")
- S = GLOB.xeno_tail_list[H.dna.features["xenotail"]]
-
- if(!S || S.icon_state == "none")
- continue
-
- var/mutable_appearance/accessory_overlay = mutable_appearance(S.icon, layer = -layer)
-
- accessory_overlay.color = null //just because. reee.
-
- //A little rename so we don't have to use tail_lizard or tail_human when naming the sprites.
- if(bodypart == "tail_lizard" || bodypart == "tail_human" || bodypart == "mam_tail" || bodypart == "xenotail")
- bodypart = "tail"
- if(bodypart == "mam_waggingtail" || bodypart == "waggingtail_human" || bodypart == "waggingtail_lizard")
- bodypart = "tailwag"
- if(bodypart == "mam_ears" || bodypart == "ears")
- bodypart = "ears"
- if(bodypart == "mam_snouts" || bodypart == "snout")
- bodypart = "snout"
- if(bodypart == "xenohead")
- bodypart = "xhead"
- if(bodypart == "insect_wings" || bodypart == "deco_wings")
- bodypart = "insect_wings"
+ for(var/layer in relevant_layers)
+ var/layertext = layer_text[layer]
+ if(!layertext) // should there
+ stack_trace("invalid layer '[layer]' found in the list of relevant layers on species.handle_mutant_bodyparts().")
+ continue
+ var/layernum = text2num(layer)
+ for(var/bodypart in relevant_layers[layer])
+ var/datum/sprite_accessory/S = bodypart
+ var/mutable_appearance/accessory_overlay = mutable_appearance(S.icon, layer = -layernum)
+ bodypart = S.mutant_part_string || dna_feature_as_text_string[S]
if(S.gender_specific)
- accessory_overlay.icon_state = "[g]_[bodypart]_[S.icon_state]_[layertext]"
+ accessory_overlay.icon_state = "[g]_[bodypart]_[S.icon_state][layertext]"
else
- accessory_overlay.icon_state = "m_[bodypart]_[S.icon_state]_[layertext]"
+ accessory_overlay.icon_state = "m_[bodypart]_[S.icon_state][layertext]"
if(S.center)
accessory_overlay = center_image(accessory_overlay, S.dimension_x, S.dimension_y)
- var/list/colorlist = list()
- colorlist.Cut()
- colorlist += ReadRGB("[H.dna.features["mcolor"]]0")
- colorlist += ReadRGB("[H.dna.features["mcolor2"]]0")
- colorlist += ReadRGB("[H.dna.features["mcolor3"]]0")
- colorlist += list(0,0,0, hair_alpha)
- for(var/index=1, index<=colorlist.len, index++)
- colorlist[index] = colorlist[index]/255
-
if(!HAS_TRAIT(H, TRAIT_HUSK))
if(!forced_colour)
switch(S.color_src)
@@ -894,14 +890,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
if(bodypart == "tail")
accessory_overlay.icon_state = "m_tail_husk_[layertext]"
if(S.color_src == MATRIXED)
- var/list/husklist = list()
- husklist += ReadRGB("#a3a3a3")
- husklist += ReadRGB("#a3a3a3")
- husklist += ReadRGB("#a3a3a3")
- husklist += list(0,0,0, hair_alpha)
- for(var/index=1, index<=husklist.len, index++)
- husklist[index] = husklist[index]/255
- accessory_overlay.color = husklist
+ accessory_overlay.color = colorlist
if(OFFSET_MUTPARTS in H.dna.species.offset_features)
accessory_overlay.pixel_x += H.dna.species.offset_features[OFFSET_MUTPARTS][1]
@@ -910,7 +899,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
standing += accessory_overlay
if(S.hasinner)
- var/mutable_appearance/inner_accessory_overlay = mutable_appearance(S.icon, layer = -layer)
+ var/mutable_appearance/inner_accessory_overlay = mutable_appearance(S.icon, layer = -layernum)
if(S.gender_specific)
inner_accessory_overlay.icon_state = "[g]_[bodypart]inner_[S.icon_state]_[layertext]"
else
@@ -926,7 +915,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
standing += inner_accessory_overlay
if(S.extra) //apply the extra overlay, if there is one
- var/mutable_appearance/extra_accessory_overlay = mutable_appearance(S.icon, layer = -layer)
+ var/mutable_appearance/extra_accessory_overlay = mutable_appearance(S.icon, layer = -layernum)
if(S.gender_specific)
extra_accessory_overlay.icon_state = "[g]_[bodypart]_extra_[S.icon_state]_[layertext]"
else
@@ -973,7 +962,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
standing += extra_accessory_overlay
if(S.extra2) //apply the extra overlay, if there is one
- var/mutable_appearance/extra2_accessory_overlay = mutable_appearance(S.icon, layer = -layer)
+ var/mutable_appearance/extra2_accessory_overlay = mutable_appearance(S.icon, layer = -layernum)
if(S.gender_specific)
extra2_accessory_overlay.icon_state = "[g]_[bodypart]_extra2_[S.icon_state]_[layertext]"
else
@@ -1019,8 +1008,8 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
H.apply_overlay(BODY_BEHIND_LAYER)
H.apply_overlay(BODY_ADJ_LAYER)
+ H.apply_overlay(BODY_ADJ_UPPER_LAYER)
H.apply_overlay(BODY_FRONT_LAYER)
- H.apply_overlay(BODY_TAUR_LAYER) // CITADEL EDIT
/*
@@ -1032,21 +1021,6 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
outfit_important_for_life= new()
outfit_important_for_life.equip(human_to_equip)
-//This exists so sprite accessories can still be per-layer without having to include that layer's
-//number in their sprite name, which causes issues when those numbers change.
-/datum/species/proc/mutant_bodyparts_layertext(layer)
- switch(layer)
- if(BODY_BEHIND_LAYER)
- return "BEHIND"
- if(BODY_ADJ_LAYER)
- return "ADJ"
- if(BODY_FRONT_LAYER)
- return "FRONT"
- //CITADEL EDIT
- if(BODY_TAUR_LAYER)
- return "TAUR"
- //END EDIT
-
/* TODO: Snowflake trail marks
// Impliments different trails for species depending on if they're wearing shoes.
/datum/species/proc/get_move_trail(var/mob/living/carbon/human/H)
@@ -1456,12 +1430,12 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
if(target.check_martial_melee_block())
target.visible_message("[target] blocks [user]'s attack!")
return FALSE
-
+
if(HAS_TRAIT(user, TRAIT_PUGILIST))//CITADEL CHANGE - makes punching cause staminaloss but funny martial artist types get a discount
user.adjustStaminaLossBuffered(1.5)
else
user.adjustStaminaLossBuffered(3.5)
-
+
if(attacker_style && attacker_style.harm_act(user,target))
return TRUE
else
@@ -1526,7 +1500,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
if(user.limb_destroyer)
target.dismembering_strike(user, affecting.body_zone)
-
+
if(atk_verb == ATTACK_EFFECT_KICK)//kicks deal 1.5x raw damage + 0.5x stamina damage
target.apply_damage(damage*1.5, BRUTE, affecting, armor_block)
target.apply_damage(damage*0.5, STAMINA, affecting, armor_block)
@@ -1538,21 +1512,21 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
if((target.stat != DEAD) && damage >= user.dna.species.punchstunthreshold)
if((punchedstam > 50) && prob(punchedstam*0.5)) //If our punch victim has been hit above the threshold, and they have more than 50 stamina damage, roll for stun, probability of 1% per 2 stamina damage
-
+
target.visible_message("[user] knocks [target] down!", \
"You're knocked down by [user]!", "You hear aggressive shuffling followed by a loud thud!", COMBAT_MESSAGE_RANGE, user)
to_chat(user, "You knock [target] down!")
-
+
var/knockdown_duration = 40 + (punchedstam + (punchedbrute*0.5))*0.8 - armor_block
target.DefaultCombatKnockdown(knockdown_duration)
target.forcesay(GLOB.hit_appends)
log_combat(user, target, "got a stun punch with their previous punch")
-
+
if(HAS_TRAIT(user, TRAIT_KI_VAMPIRE) && !HAS_TRAIT(target, TRAIT_NOBREATH) && (punchedbrute < 100)) //If we're a ki vampire we also sap them of lifeforce, but only if they're not too beat up. Also living organics only.
user.adjustBruteLoss(-5)
user.adjustFireLoss(-5)
user.adjustStaminaLoss(-20)
-
+
target.adjustCloneLoss(10)
target.adjustBruteLoss(10)
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 63e772e07c..3d47cdae36 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -129,15 +129,23 @@ There are several things that need to be remembered:
alt_worn = 'icons/mob/clothing/uniform_digi.dmi'
variant_flag |= STYLE_DIGITIGRADE
+ var/mask
+ if(dna.species.mutant_bodyparts["taur"])
+ var/datum/sprite_accessory/taur/T = GLOB.taur_list[dna.features["taur"]]
+ var/clip_flag = U.mutantrace_variation & T?.hide_legs
+ if(clip_flag)
+ variant_flag |= clip_flag
+ mask = T.alpha_mask_state
+
var/mutable_appearance/uniform_overlay
if(dna && dna.species.sexes)
- var/G = (dna.features["body_model"] == FEMALE) ? "f" : "m"
- if(G == "f" && U.fitted != NO_FEMALE_UNIFORM)
- uniform_overlay = U.build_worn_icon(UNIFORM_LAYER, alt_worn, FALSE, U.fitted, target_overlay, variant_flag, FALSE)
+ if(dna.features["body_model"] == FEMALE && U.fitted != NO_FEMALE_UNIFORM)
+ uniform_overlay = U.build_worn_icon(UNIFORM_LAYER, alt_worn, FALSE, U.fitted, target_overlay, variant_flag, FALSE, mask)
+
if(!uniform_overlay)
- uniform_overlay = U.build_worn_icon( UNIFORM_LAYER, alt_worn, FALSE, NO_FEMALE_UNIFORM, target_overlay, variant_flag, FALSE)
+ uniform_overlay = U.build_worn_icon( UNIFORM_LAYER, alt_worn, FALSE, NO_FEMALE_UNIFORM, target_overlay, variant_flag, FALSE, mask)
if(OFFSET_UNIFORM in dna.species.offset_features)
@@ -269,6 +277,11 @@ There are several things that need to be remembered:
var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_SHOES]
inv.update_icon()
+ if(dna.species.mutant_bodyparts["taur"])
+ var/datum/sprite_accessory/taur/T = GLOB.taur_list[dna.features["taur"]]
+ if(T?.hide_legs) //If only they actually made shoes unwearable. Please don't making cosmetics, guys.
+ return
+
if(shoes)
var/obj/item/clothing/shoes/S = shoes
shoes.screen_loc = ui_shoes //move the item to the appropriate screen loc
@@ -507,12 +520,17 @@ There are several things that need to be remembered:
overlays_standing[BACK_LAYER] = back_overlay
apply_overlay(BACK_LAYER)
-/proc/wear_female_version(t_color, icon, layer, type)
- var/index = "[t_color]-[icon]"
- var/icon/female_clothing_icon = GLOB.female_clothing_icons[index]
- if(!female_clothing_icon) //Create standing/laying icons if they don't exist
- generate_female_clothing(index,t_color,icon,type)
- return mutable_appearance(GLOB.female_clothing_icons[index], layer = -layer)
+/proc/wear_alpha_masked_version(state, icon, layer, female, alpha_mask)
+ var/mask = "-[alpha_mask]"
+ if(islist(alpha_mask))
+ mask = "-"
+ for(var/t in alpha_mask)
+ mask += t
+ var/index = "[state]-[icon]-[female][mask]"
+ . = GLOB.alpha_masked_worn_clothing_icons[index]
+ if(!.) //Create standing/laying icons if they don't exist
+ . = generate_alpha_masked_clothing(index,state,icon,-layer,female,alpha_mask)
+ return mutable_appearance(., layer = -layer)
/mob/living/carbon/human/proc/get_overlays_copy(list/unwantedLayers)
var/list/out = new
@@ -567,10 +585,12 @@ generate/load female uniform sprites matching all previously decided variables
style_flags: mutant race appearance flags, mostly used for worn_overlays()
+alpha_mask: a text string or list of text, the actual icons are stored in a global list and associated with said text string(s).
+
use_mob_overlay_icon: if FALSE, it will always use the default_icon_file even if mob_overlay_icon is present.
*/
-/obj/item/proc/build_worn_icon(default_layer = 0, default_icon_file = null, isinhands = FALSE, femaleuniform = NO_FEMALE_UNIFORM, override_state, style_flags = NONE, use_mob_overlay_icon = TRUE)
+/obj/item/proc/build_worn_icon(default_layer = 0, default_icon_file = null, isinhands = FALSE, femaleuniform = NO_FEMALE_UNIFORM, override_state, style_flags = NONE, use_mob_overlay_icon = TRUE, alpha_mask)
var/t_state
t_state = override_state || item_state || icon_state
@@ -590,8 +610,8 @@ use_mob_overlay_icon: if FALSE, it will always use the default_icon_file even if
layer2use = default_layer
var/mutable_appearance/standing
- if(femaleuniform)
- standing = wear_female_version(t_state,file2use,layer2use,femaleuniform)
+ if(femaleuniform || alpha_mask)
+ standing = wear_alpha_masked_version(t_state, file2use, layer2use, femaleuniform, alpha_mask)
if(!standing)
standing = mutable_appearance(file2use, t_state, -layer2use)
@@ -654,19 +674,17 @@ use_mob_overlay_icon: if FALSE, it will always use the default_icon_file even if
. += "-[dna.features["body_model"]]"
-
var/is_taur = FALSE
- if(dna.species.mutant_bodyparts["taur"] && dna.features["taur"] != "None")
- is_taur = TRUE
-
+ if(dna.species.mutant_bodyparts["taur"])
+ var/datum/sprite_accessory/taur/T = GLOB.taur_list[dna.features["taur"]]
+ if(T?.hide_legs)
+ is_taur = TRUE
+ var/static/list/leg_day = typecacheof(list(/obj/item/bodypart/r_leg, /obj/item/bodypart/l_leg))
for(var/X in bodyparts)
var/obj/item/bodypart/BP = X
-
- if(istype(BP, /obj/item/bodypart/r_leg) || istype(BP, /obj/item/bodypart/l_leg))
- if(is_taur)
- continue
-
+ if(is_taur && leg_day[BP.type])
+ continue
. += "-[BP.body_zone]"
if(BP.status == BODYPART_ORGANIC)
diff --git a/code/modules/mob/living/carbon/update_icons.dm b/code/modules/mob/living/carbon/update_icons.dm
index a431059a89..9a1c6c54b6 100644
--- a/code/modules/mob/living/carbon/update_icons.dm
+++ b/code/modules/mob/living/carbon/update_icons.dm
@@ -203,6 +203,12 @@
remove_overlay(BODYPARTS_LAYER)
+ var/is_taur = FALSE
+ if(dna?.species.mutant_bodyparts["taur"])
+ var/datum/sprite_accessory/taur/T = GLOB.taur_list[dna.features["taur"]]
+ if(T?.hide_legs)
+ is_taur = TRUE
+
for(var/X in bodyparts)
var/obj/item/bodypart/BP = X
BP.update_limb()
@@ -213,9 +219,12 @@
return
//GENERATE NEW LIMBS
+ var/static/list/leg_day = typecacheof(list(/obj/item/bodypart/r_leg, /obj/item/bodypart/l_leg))
var/list/new_limbs = list()
for(var/X in bodyparts)
var/obj/item/bodypart/BP = X
+ if(is_taur && leg_day[BP.type])
+ continue
new_limbs += BP.get_limb_icon()
if(new_limbs.len)
overlays_standing[BODYPARTS_LAYER] = new_limbs
diff --git a/icons/mob/clothing/taur_hooved.dmi b/icons/mob/clothing/taur_hooved.dmi
index 71aec5444ac300c1785a78a4c02e4790176433dd..993e9c2550ff469176b8fb1d4b4470eea5338efa 100644
GIT binary patch
delta 7388
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
F{{yk|f1dyV
diff --git a/modular_citadel/icons/mob/mam_taur.dmi b/modular_citadel/icons/mob/mam_taur.dmi
index db1f001faee73befef68ce999a0c2b2a7936f709..4d3d996cbbe55f03d4e564c286a8c1be1eff4944 100644
GIT binary patch
literal 57807
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