Skip to content

Commit

Permalink
removed unused code
Browse files Browse the repository at this point in the history
  • Loading branch information
Artemchik542 committed Feb 15, 2024
1 parent 9fc99ee commit a73163d
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 43 deletions.
5 changes: 1 addition & 4 deletions code/__DEFINES/mobs.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*ALL MOB-RELATED DEFINES THAT DON'T BELONG IN ANOTHER FILE GO HERE*/
F/*ALL MOB-RELATED DEFINES THAT DON'T BELONG IN ANOTHER FILE GO HERE*/

//Misc mob defines

Expand Down Expand Up @@ -689,10 +689,7 @@ GLOBAL_LIST_INIT(human_heights_to_offsets, list(
/// Total number of layers for mob overlays
/// KEEP THIS UP-TO-DATE OR SHIT WILL BREAK
/// Also consider updating layers_to_offset


#define TOTAL_LAYERS 34

/// Mutations layer - Tk headglows, cold resistance glow, etc
#define MUTATIONS_LAYER 34
/// Mutantrace features (tail when looking south) that must appear behind the body parts
Expand Down
2 changes: 1 addition & 1 deletion code/__DEFINES/sprite_accessories.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/// Color of the sprite accessory will match the owner's mutant color, which is granted by certain species
#define MUTANT_COLOR "mutant_color"
///Secondary color of the sprite accessory will match the owner's mutant secondary color, which is granted by certain species
#define MUTANT_COLOR_SECONDARY "mutant_color_secondary"
#define MUTANT_COLOR_SECONDARY "mutant_color_secondary" // MASSMETA EDIT
/// Color of the sprite accessory will match the owner's hair color
#define HAIR_COLOR "hair_color"
/// Color of the sprite accessory will match the owner's facial hair color
Expand Down
3 changes: 1 addition & 2 deletions code/__DEFINES/traits/declarations.dm
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
/// Species with this trait use mutant colors for coloration
#define TRAIT_MUTANT_COLORS "mutcolors"

/// MASSMETA EDIT
/// Species with this trait use second mutant colors for coloration
#define TRAIT_MUTANT_COLORS_SECONDARY "mutcolors_secondary"
#define TRAIT_MUTANT_COLORS_SECONDARY "mutcolors_secondary" // MASSMETA EDIT

/// Species with this trait have mutant colors that cannot be chosen by the player, nor altered ingame by external means
#define TRAIT_FIXED_MUTANT_COLORS "fixed_mutcolors"
Expand Down
10 changes: 1 addition & 9 deletions code/datums/bodypart_overlays/bodypart_overlay.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,9 @@
// Edit START (secondary color)

///Wrapper for getting the proper secondary image, colored and everything
///datum/bodypart_overlay/proc/get_secondary_overlay(layer, obj/item/bodypart/limb) // MASSMETA EDIT
//layer = bitflag_to_layer(layer)
//. = get_image_inner(layer, limb)

/datum/bodypart_overlay/proc/get_extended_overlay(layer, obj/item/bodypart/limb)
/datum/bodypart_overlay/proc/get_extended_overlay(layer, obj/item/bodypart/limb) // MASSMETA EDIT
return

///support proc for get_secondary_overlay()
///datum/bodypart_overlay/proc/get_image_inner(layer, obj/item/bodypart/limb)
//return FALSE

//Edit END

///Generate the image. Needs to be overriden
Expand Down
27 changes: 0 additions & 27 deletions code/datums/bodypart_overlays/mutant_bodypart_overlay.dm
Original file line number Diff line number Diff line change
Expand Up @@ -77,33 +77,6 @@

return appearance

// Edit START (secondary color)
/*
/datum/bodypart_overlay/mutant/get_image_inner(image_layer, obj/item/bodypart/limb) // MASSMETA EDIT
if(!sprite_datum)
CRASH("Trying to call get_image() on [type] while it didn't have a sprite_datum. This shouldn't happen, report it as soon as possible.")
if(!sprite_datum.hasinner)
return null
var/gender = (limb?.limb_gender == FEMALE) ? "f" : "m"
var/list/icon_state_builder = list()
icon_state_builder += sprite_datum.gender_specific ? gender : "m" //Male is default because sprite accessories are so ancient they predate the concept of not hardcoding gender
icon_state_builder += "[feature_key]inner"
icon_state_builder += get_base_icon_state()
icon_state_builder += mutant_bodyparts_layertext(image_layer)
var/finished_icon_state = icon_state_builder.Join("_")
var/mutable_appearance/appearance = mutable_appearance(sprite_datum.icon, finished_icon_state, layer = image_layer)
if(sprite_datum.center)
center_image(appearance, sprite_datum.dimension_x, sprite_datum.dimension_y)
return appearance
*/
// Edit END

/datum/bodypart_overlay/mutant/color_image(image/overlay, layer, obj/item/bodypart/limb)

overlay.color = sprite_datum.color_src ? draw_color : null
Expand Down

0 comments on commit a73163d

Please sign in to comment.