diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 702b14a40ad..0e5636a2549 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -872,32 +872,43 @@ GLOBAL_LIST_INIT(human_heights_to_offsets, list( #define BODYPARTS_HIGH_LAYER 17.5 /// ID card layer #define ID_LAYER 18 +// BUBBER EDIT ADDITION BEGIN +#define BANDAGE_LAYER 19 +#define NIPPLES_LAYER 20 +#define PENIS_LAYER 21 +#define VAGINA_LAYER 22 +#define ANUS_LAYER 23 +// BUBBER EDIT ADDITION END /// Jumpsuit clothing layer -#define UNIFORM_LAYER 19 +#define UNIFORM_LAYER 24 /// The layer underneath the uniform - #define UNDER_UNIFORM_LAYER 19.1 + #define UNDER_UNIFORM_LAYER 24.1 +// BUBBER EDIT ADDITION BEGIN +/// This layer is used for things that shouldn't be over clothes, but should be over mutations +#define BODY_FRONT_UNDER_CLOTHES 25 +// BUBBER EDIT ADDITION END /// Damage indicators (cuts and burns) -#define DAMAGE_LAYER 20 +#define DAMAGE_LAYER 26 /// Mutations that should appear above everything else (e.g. laser eyes) - #define FRONT_MUTATIONS_LAYER 20.9 + #define FRONT_MUTATIONS_LAYER 26.9 /// Eyes and eyelids -#define EYES_LAYER 21 +#define EYES_LAYER 27 /// Underwear, undershirts, socks -#define BODY_LAYER 22 +#define BODY_LAYER 28 /// Mutantrace features (snout, body markings) that must appear above the body parts - #define BODY_ADJ_LAYER 22.9 + #define BODY_ADJ_LAYER 28.9 /// Layer for most bodyparts, appears above BODYPARTS_LOW_LAYER and below BODYPARTS_HIGH_LAYER -#define BODYPARTS_LAYER 23 +#define BODYPARTS_LAYER 29 /// Layer for bodyparts that should appear behind every other bodypart - Mostly, legs when facing WEST or EAST - #define BODYPARTS_LOW_LAYER 23.1 + #define BODYPARTS_LOW_LAYER 29.1 /// Mutantrace features (tail when looking south) that must appear behind the body parts - #define BODY_BEHIND_LAYER 23.2 + #define BODY_BEHIND_LAYER 29.2 /// Mutations layer - Tk headglows, cold resistance glow, etc. Very bottom of the mob - #define MUTATIONS_LAYER 23.9 + #define MUTATIONS_LAYER 29.9 /// Total number of standing overlays. /// KEEP THIS UP-TO-DATE OR SHIT WILL BREAK. /// (You ONLY need to update this if you add a standing overlay, adding an integer.) -#define TOTAL_LAYERS 23 +#define TOTAL_LAYERS 29 #define UPPER_BODY "upper body" #define LOWER_BODY "lower body" diff --git a/modular_skyrat/master_files/code/game/objects/items/hhmirror.dm b/modular_skyrat/master_files/code/game/objects/items/hhmirror.dm index 7b2eef804c3..a76801732d4 100644 --- a/modular_skyrat/master_files/code/game/objects/items/hhmirror.dm +++ b/modular_skyrat/master_files/code/game/objects/items/hhmirror.dm @@ -84,7 +84,6 @@ #undef MIN_MCOLOR_VALUE human_user.update_body() - human_user.update_mutations_overlay() // no hulk lizard if("gender") if(!(human_user.gender in list("male", "female"))) // blame the patriarchy @@ -106,7 +105,6 @@ return human_user.dna.update_ui_block(/datum/dna_block/identity/gender) human_user.update_body() - human_user.update_mutations_overlay() // (hulk male/female) if("hair") var/hairchoice = tgui_alert(human_user, "Hair style or hair color?", "Change Hair", list("Style", "Color")) @@ -188,7 +186,6 @@ return human_user.dna.update_ui_block(/datum/dna_block/identity/gender) human_user.update_body() - human_user.update_mutations_overlay() // (hulk male/female) if("hair") var/hairchoice = tgui_alert(human_user, "Hair style or hair color?", "Change Hair", list("Style", "Color")) diff --git a/modular_skyrat/master_files/code/modules/clothing/glasses/_glasses.dm b/modular_skyrat/master_files/code/modules/clothing/glasses/_glasses.dm index b151b366d47..306e751153c 100644 --- a/modular_skyrat/master_files/code/modules/clothing/glasses/_glasses.dm +++ b/modular_skyrat/master_files/code/modules/clothing/glasses/_glasses.dm @@ -9,7 +9,7 @@ if(!isnull(alternate_worn_layer) && alternate_worn_layer < BODY_FRONT_LAYER) // if the alternate worn layer was already lower than snouts then leave it be return - alternate_worn_layer = ABOVE_BODY_FRONT_GLASSES_LAYER + alternate_worn_layer = ABOVE_BODY_FRONT_LAYER user.update_worn_glasses() /obj/item/clothing/glasses/dropped(mob/living/carbon/human/user) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_chemistry/reagents/_aphrodisiac.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_chemistry/reagents/_aphrodisiac.dm index a241de722f3..3072b7967f5 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_chemistry/reagents/_aphrodisiac.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_chemistry/reagents/_aphrodisiac.dm @@ -600,7 +600,7 @@ if(exposed_mob) exposed_mob.update_body() if(mutations_overlay) - exposed_mob.update_mutations_overlay() + exposed_mob.update_appearance(UPDATE_OVERLAYS) #undef TAKE_DAMAGE_THRESHOLD_PENIS #undef TAKE_DAMAGE_THRESHOLD_BREASTS