diff --git a/citadel.dme b/citadel.dme index 6698b4ac313c..abf6e2030471 100644 --- a/citadel.dme +++ b/citadel.dme @@ -147,7 +147,6 @@ #include "code\__DEFINES\client\player_flags.dm" #include "code\__DEFINES\client\playtime.dm" #include "code\__DEFINES\color\color.dm" -#include "code\__DEFINES\color\colour_priority.dm" #include "code\__DEFINES\color\lights.dm" #include "code\__DEFINES\color\lum.dm" #include "code\__DEFINES\combat\armor.dm" diff --git a/code/__DEFINES/color/colour_priority.dm b/code/__DEFINES/color/colour_priority.dm deleted file mode 100644 index e88784987f89..000000000000 --- a/code/__DEFINES/color/colour_priority.dm +++ /dev/null @@ -1,11 +0,0 @@ -//different types of atom colorations -///only used by rare effects like greentext coloring mobs and when admins varedit color -#define ADMIN_COLOUR_PRIORITY 1 -///e.g. purple effect of the revenant on a mob, black effect when mob electrocuted -#define TEMPORARY_COLOUR_PRIORITY 2 -///color splashed onto an atom (e.g. paint on turf) -#define WASHABLE_COLOUR_PRIORITY 3 -///color inherent to the atom (e.g. blob color) -#define FIXED_COLOUR_PRIORITY 4 -///how many priority levels there are. -#define COLOUR_PRIORITY_AMOUNT 4 diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index 2110b7cd224d..7b1d6e8a71af 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -781,27 +781,6 @@ GLOBAL_LIST_EMPTY(friendly_animal_types) //Lame. /image/proc/setDir(newdir) dir = newdir -/* -GLOBAL_LIST_INIT(freon_color_matrix, list("#2E5E69", "#60A2A8", "#A1AFB1", rgb(0,0,0))) - -/obj/proc/make_frozen_visual() - // Used to make the frozen item visuals for Freon. - if(resistance_flags & FREEZE_PROOF) - return - if(!(obj_flags & FROZEN)) - name = "frozen [name]" - add_atom_colour(GLOB.freon_color_matrix, TEMPORARY_COLOUR_PRIORITY) - alpha -= 25 - obj_flags |= FROZEN - -//Assumes already frozed -/obj/proc/make_unfrozen() - if(obj_flags & FROZEN) - name = replacetext(name, "frozen ", "") - remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, GLOB.freon_color_matrix) - alpha += 25 - obj_flags &= ~FROZEN -*/ /** * Converts an icon to base64. Operates by putting the icon in the iconCache savefile, diff --git a/code/game/atoms/_atom.dm b/code/game/atoms/_atom.dm index e0d07548e9e3..e4e9097fd3ed 100644 --- a/code/game/atoms/_atom.dm +++ b/code/game/atoms/_atom.dm @@ -721,35 +721,35 @@ var/datum/component/radioactive/RA = GetComponent(/datum/component/radioactive) RA?.clean(str, mul) -//? Atom Colour Priority System +//* Color *// + /** - * A System that gives finer control over which atom colour to colour the atom with. - * The "highest priority" one is always displayed as opposed to the default of - * "whichever was set last is displayed" + * Managed color set procs for the atom's raw `color` variable. This used to be a full priority system, + * but it was determined to be unnecessary. */ /** * getter for current color */ -/atom/proc/get_atom_colour() +/atom/proc/get_atom_color() CRASH("base proc hit") /** * copies from other */ -/atom/proc/copy_atom_colour(atom/other, colour_priority) +/atom/proc/copy_atom_color(atom/other) CRASH("base proc hit") -/// Adds an instance of colour_type to the atom's atom_colours list -/atom/proc/add_atom_colour(coloration, colour_priority) +/// Adds an instance of colour_type to the atom's atom_colors list +/atom/proc/add_atom_color(new_color) CRASH("base proc hit") -/// Removes an instance of colour_type from the atom's atom_colours list -/atom/proc/remove_atom_colour(colour_priority, coloration) +/// Removes an instance of colour_type from the atom's atom_colors list +/atom/proc/remove_atom_color(require_color) CRASH("base proc hit") /// Resets the atom's color to null, and then sets it to the highest priority colour available -/atom/proc/update_atom_colour() +/atom/proc/update_atom_color() CRASH("base proc hit") //* Deletions *// diff --git a/code/game/atoms/atom_vv.dm b/code/game/atoms/atom_vv.dm index 4937bb3e97c2..d056489f6dd9 100644 --- a/code/game/atoms/atom_vv.dm +++ b/code/game/atoms/atom_vv.dm @@ -222,8 +222,6 @@ return switch(var_name) - if(NAMEOF(src, color)) - add_atom_colour(color, ADMIN_COLOUR_PRIORITY) if(NAMEOF(src, base_layer), NAMEOF(src, layer)) set_base_layer(var_value) if(NAMEOF(src, relative_layer)) diff --git a/code/game/atoms/atoms_initializing_EXPENSIVE.dm b/code/game/atoms/atoms_initializing_EXPENSIVE.dm index 1cb28418a64e..db649915d924 100644 --- a/code/game/atoms/atoms_initializing_EXPENSIVE.dm +++ b/code/game/atoms/atoms_initializing_EXPENSIVE.dm @@ -129,7 +129,7 @@ //atom color stuff if(color) - add_atom_colour(color, FIXED_COLOUR_PRIORITY) + add_atom_color(color) if(light_power && light_range) update_light() diff --git a/code/game/atoms/movable/movable.dm b/code/game/atoms/movable/movable.dm index bed10f12c2d3..bcfa840cb019 100644 --- a/code/game/atoms/movable/movable.dm +++ b/code/game/atoms/movable/movable.dm @@ -153,16 +153,6 @@ */ var/throw_speed_scaling_exponential = THROW_SPEED_SCALING_CONSTANT_DEFAULT - //? Colors - /** - * used to store the different colors on an atom - * - * its inherent color, the colored paint applied on it, special color effect etc... - */ - var/list/atom_colours - /// use expensive color priority system - var/atom_colouration_system = FALSE - //? Emissives /// Either FALSE, [EMISSIVE_BLOCK_GENERIC], or [EMISSIVE_BLOCK_UNIQUE] var/blocks_emissive = FALSE @@ -192,9 +182,6 @@ /atom/movable/Initialize(mapload) . = ..() - //atom color stuff - if(!isnull(color) && atom_colouration_system) - add_atom_colour(color, FIXED_COLOUR_PRIORITY) // WARNING WARNING SHITCODE THIS MEANS THAT ONLY TURFS RECEIVE MAPLOAD ENTERED // DO NOT RELY ON ENTERED // TODO: what would tg do (but maybe not that much component signal abuse?) @@ -548,84 +535,22 @@ //? atom colors -/** - * getter for current color - */ -/atom/movable/get_atom_colour() +/atom/movable/get_atom_color() return color -/** - * copies from other - */ -/atom/movable/copy_atom_colour(atom/other, colour_priority) - if(!atom_colouration_system) - var/others = other.get_atom_colour() - if(isnull(others)) - return - color = others - return - add_atom_colour(other.get_atom_colour(), colour_priority || FIXED_COLOUR_PRIORITY) +/atom/movable/copy_atom_color(atom/other) + color = other.get_atom_color() -/** - * copies all from another movable - */ -/atom/movable/proc/copy_atom_colours(atom/movable/other) - if(!atom_colouration_system) - return copy_atom_colour(other) - if(isnull(other.atom_colours)) - return - atom_colours = other.atom_colours.Copy() - update_atom_colour() +/atom/movable/add_atom_color(new_color) + color = new_color -/// Adds an instance of colour_type to the atom's atom_colours list -/atom/movable/add_atom_colour(coloration, colour_priority) - if(!coloration) - return - if(!atom_colouration_system) - color = coloration - return - if(colour_priority > COLOUR_PRIORITY_AMOUNT) - return - if(!atom_colours || !atom_colours.len) - atom_colours = list() - atom_colours.len = COLOUR_PRIORITY_AMOUNT //four priority levels currently. - atom_colours[colour_priority] = coloration - update_atom_colour() - -/// Removes an instance of colour_type from the atom's atom_colours list -/atom/movable/remove_atom_colour(colour_priority, coloration) - if(!atom_colouration_system) - if(coloration && color != coloration) - return - if(isnull(color)) - return - color = null - return - if(!islist(atom_colours)) - return - if(colour_priority > COLOUR_PRIORITY_AMOUNT) - return - if(coloration && atom_colours[colour_priority] != coloration) - return //if we don't have the expected color (for a specific priority) to remove, do nothing - atom_colours[colour_priority] = null - update_atom_colour() - -/// Resets the atom's color to null, and then sets it to the highest priority colour available -/atom/movable/update_atom_colour() - if(!atom_colouration_system) - return - if(!islist(atom_colours)) +/atom/movable/remove_atom_color(require_color) + if(require_color && color != require_color) return color = null - for(var/C in atom_colours) - if(islist(C)) - var/list/L = C - if(L.len) - color = L - return - else if(C) - color = C - return + +/atom/movable/update_atom_color() + return //* Rendering *// diff --git a/code/game/machinery/gear_painter.dm b/code/game/machinery/gear_painter.dm index 725a1d8f7638..4989687346ae 100644 --- a/code/game/machinery/gear_painter.dm +++ b/code/game/machinery/gear_painter.dm @@ -192,7 +192,7 @@ drop_item() return TRUE if("clear") - inserted.remove_atom_colour(FIXED_COLOUR_PRIORITY) + inserted.remove_atom_color() playsound(src, 'sound/effects/spray3.ogg', 50, 1) temp = "Cleared Successfully!" return TRUE @@ -236,7 +236,7 @@ if(!color_to_use || !check_valid_color(color_to_use, user)) to_chat(user, SPAN_NOTICE("Invalid color.")) return FALSE - inserted.add_atom_colour(color_to_use, FIXED_COLOUR_PRIORITY) + inserted.add_atom_color(color_to_use) playsound(src, 'sound/effects/spray3.ogg', 50, 1) return TRUE diff --git a/code/game/objects/effects/debris/cleanable/blood.dm b/code/game/objects/effects/debris/cleanable/blood.dm index 220680d47bd7..6a318e6d8d11 100644 --- a/code/game/objects/effects/debris/cleanable/blood.dm +++ b/code/game/objects/effects/debris/cleanable/blood.dm @@ -70,7 +70,7 @@ var/global/list/image/splatter_cache=list() /obj/effect/debris/cleanable/blood/update_icon() if(basecolor == "rainbow") basecolor = "#[get_random_colour(1)]" - add_atom_colour(basecolor, FIXED_COLOUR_PRIORITY) + add_atom_color(basecolor) if(basecolor == SYNTH_BLOOD_COLOUR) name = "oil" @@ -129,7 +129,7 @@ var/global/list/image/splatter_cache=list() name = dryname desc = drydesc var/newcolor = adjust_brightness(color, -50) - add_atom_colour(newcolor, FIXED_COLOUR_PRIORITY) + add_atom_color(newcolor) amount = 0 /obj/effect/debris/cleanable/blood/attack_hand(mob/user, datum/event_args/actor/clickchain/e_args) diff --git a/code/game/objects/effects/debris/debris.dm b/code/game/objects/effects/debris/debris.dm index db20905f1321..c25f8ef28701 100644 --- a/code/game/objects/effects/debris/debris.dm +++ b/code/game/objects/effects/debris/debris.dm @@ -60,19 +60,19 @@ //* Atom Color - we don't use the expensive system. *// -/obj/effect/debris/get_atom_colour() +/obj/effect/debris/get_atom_color() return color -/obj/effect/debris/add_atom_colour(coloration, colour_priority) +/obj/effect/debris/add_atom_color(coloration, colour_priority) color = coloration -/obj/effect/debris/remove_atom_colour(colour_priority, coloration) +/obj/effect/debris/remove_atom_color(colour_priority, coloration) color = null -/obj/effect/debris/update_atom_colour() +/obj/effect/debris/update_atom_color() return -/obj/effect/debris/copy_atom_colour(atom/other, colour_priority) +/obj/effect/debris/copy_atom_color(atom/other, colour_priority) if(isnull(other.color)) return color = other.color diff --git a/code/game/objects/items/melee/types/misc.dm b/code/game/objects/items/melee/types/misc.dm index 89637a6aa540..5dfbe00339c8 100644 --- a/code/game/objects/items/melee/types/misc.dm +++ b/code/game/objects/items/melee/types/misc.dm @@ -47,7 +47,7 @@ // Randomizes color /obj/item/melee/umbrella/random/Initialize(mapload) - add_atom_colour("#"+get_random_colour(), FIXED_COLOUR_PRIORITY) + add_atom_color("#"+get_random_colour()) return ..() /obj/item/melee/cursedblade diff --git a/code/game/objects/items/storage/wallets.dm b/code/game/objects/items/storage/wallets.dm index 61f5957195bc..07b417800323 100644 --- a/code/game/objects/items/storage/wallets.dm +++ b/code/game/objects/items/storage/wallets.dm @@ -110,7 +110,7 @@ /obj/item/storage/wallet/poly/Initialize(mapload) . = ..() - add_atom_colour("#"+get_random_colour(), FIXED_COLOUR_PRIORITY) + add_atom_color("#"+get_random_colour()) update_icon() /obj/item/storage/wallet/poly/verb/change_color() @@ -125,7 +125,7 @@ var/new_color = input(usr, "Pick a new color", "Wallet Color", color) as color|null if(new_color) - add_atom_colour(new_color, FIXED_COLOUR_PRIORITY) + add_atom_color(new_color) /obj/item/storage/wallet/poly/emp_act() var/original_state = icon_state diff --git a/code/game/objects/items/tools/switchtool.dm b/code/game/objects/items/tools/switchtool.dm index 61823b65d7b3..9b7499f08456 100644 --- a/code/game/objects/items/tools/switchtool.dm +++ b/code/game/objects/items/tools/switchtool.dm @@ -359,7 +359,7 @@ /obj/item/switchtool/holo/Initialize(mapload) . = ..() - add_atom_colour(light_color, FIXED_COLOUR_PRIORITY) + add_atom_color(light_color) /obj/item/switchtool/holo/deploy(var/obj/item/module) //We lightin' it up in here ..() diff --git a/code/game/objects/items/weapons/towels.dm b/code/game/objects/items/weapons/towels.dm index 687963a5b24d..148977ece81f 100644 --- a/code/game/objects/items/weapons/towels.dm +++ b/code/game/objects/items/weapons/towels.dm @@ -39,4 +39,4 @@ /obj/item/towel/random/Initialize(mapload) . = ..() - add_atom_colour("#"+get_random_colour(), FIXED_COLOUR_PRIORITY) + add_atom_color("#"+get_random_colour()) diff --git a/code/game/objects/obj.dm b/code/game/objects/obj.dm index 237a5e97a615..33ebad602a1f 100644 --- a/code/game/objects/obj.dm +++ b/code/game/objects/obj.dm @@ -4,7 +4,6 @@ pass_flags_self = ATOM_PASS_OVERHEAD_THROW animate_movement = SLIDE_STEPS rad_flags = NONE - atom_colouration_system = TRUE integrity_enabled = TRUE armor_type = /datum/armor/object/default diff --git a/code/game/objects/structures/gravemarker.dm b/code/game/objects/structures/gravemarker.dm index 57090b60c2b2..5c4305d974fc 100644 --- a/code/game/objects/structures/gravemarker.dm +++ b/code/game/objects/structures/gravemarker.dm @@ -28,7 +28,7 @@ if(!material) qdel(src) return - add_atom_colour(material.icon_colour, FIXED_COLOUR_PRIORITY) + add_atom_color(material.icon_colour) /obj/structure/gravemarker/examine(mob/user, dist) . = ..() diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index 091b68b8b811..d5b3423d2234 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -27,7 +27,7 @@ /obj/structure/bed/Initialize(mapload, new_material, new_padding_material) . = ..(mapload) - remove_atom_colour(FIXED_COLOUR_PRIORITY) + remove_atom_color() if(!new_material) new_material = MAT_STEEL material = get_material_by_name(new_material) diff --git a/code/game/rendering/screen.dm b/code/game/rendering/screen.dm index 8a035b91b981..79f6536adcb4 100644 --- a/code/game/rendering/screen.dm +++ b/code/game/rendering/screen.dm @@ -3,7 +3,6 @@ /atom/movable/screen appearance_flags = PIXEL_SCALE | NO_CLIENT_COLOR - atom_colouration_system = FALSE plane = HUD_PLANE layer = HUD_LAYER_BASE var/obj/master = null //A reference to the object in the slot. Grabs or items, generally. diff --git a/code/game/turfs/change_turf.dm b/code/game/turfs/change_turf.dm index a911e0501ea5..54b15506d751 100644 --- a/code/game/turfs/change_turf.dm +++ b/code/game/turfs/change_turf.dm @@ -36,7 +36,7 @@ GLOBAL_LIST_INIT(multiz_hole_baseturfs, typecacheof(list( T.icon_state = icon_state if(T.icon != icon) T.icon = icon - T.copy_atom_colour(src) + T.copy_atom_color(src) if(T.dir != dir) T.setDir(dir) return T diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 4089dce36c06..6d439de3b5aa 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -162,7 +162,7 @@ //atom color stuff if(color) - add_atom_colour(color, FIXED_COLOUR_PRIORITY) + add_atom_color(color) // todo: uh oh. // TODO: what would tg do (but maybe not that much component signal abuse?) @@ -583,19 +583,19 @@ //* Atom Color - we don't use the expensive system. *// -/turf/get_atom_colour() +/turf/get_atom_color() return color -/turf/add_atom_colour(coloration, colour_priority) +/turf/add_atom_color(coloration, colour_priority) color = coloration -/turf/remove_atom_colour(colour_priority, coloration) +/turf/remove_atom_color(colour_priority, coloration) color = null -/turf/update_atom_colour() +/turf/update_atom_color() return -/turf/copy_atom_colour(atom/other, colour_priority) +/turf/copy_atom_color(atom/other, colour_priority) if(isnull(other.color)) return color = other.color diff --git a/code/modules/atmospherics/machinery/machinery.dm b/code/modules/atmospherics/machinery/machinery.dm index 4d1b643218fc..bd6d2287ce58 100644 --- a/code/modules/atmospherics/machinery/machinery.dm +++ b/code/modules/atmospherics/machinery/machinery.dm @@ -19,7 +19,6 @@ Pipelines + Other Objects -> Pipe network obj_flags = OBJ_ON_BLUEPRINTS | OBJ_MELEE_TARGETABLE // why block contents? so you ventcrawling little fucks don't pull a 2020 Citadel Main. rad_flags = RAD_BLOCK_CONTENTS | RAD_NO_CONTAMINATE - atom_colouration_system = FALSE climb_allowed = FALSE depth_projected = FALSE hides_underfloor = OBJ_UNDERFLOOR_UNLESS_PLACED_ONTOP diff --git a/code/modules/atmospherics/machinery/pipes/he_pipes.dm b/code/modules/atmospherics/machinery/pipes/he_pipes.dm index e47c45c9e71f..2afbad129463 100644 --- a/code/modules/atmospherics/machinery/pipes/he_pipes.dm +++ b/code/modules/atmospherics/machinery/pipes/he_pipes.dm @@ -28,7 +28,7 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging/Initialize(mapload) . = ..() - add_atom_colour("#404040", FIXED_COLOUR_PRIORITY) //we don't make use of the fancy overlay system for colours, use this to set the default. + add_atom_color("#404040") //we don't make use of the fancy overlay system for colours, use this to set the default. /obj/machinery/atmospherics/pipe/simple/heat_exchanging/init_dir() ..() diff --git a/code/modules/clothing/suits/hooded.dm b/code/modules/clothing/suits/hooded.dm index 2313d71f09f6..1e83041cd00f 100644 --- a/code/modules/clothing/suits/hooded.dm +++ b/code/modules/clothing/suits/hooded.dm @@ -63,7 +63,7 @@ else hood.atom_flags &= ~PHORONGUARD hood.set_armor(fetch_armor()) - hood.copy_atom_colour(src) + hood.copy_atom_color(src) // equip after armor / color changes H.equip_to_slot_if_possible(hood, SLOT_ID_HEAD) hood_up = TRUE diff --git a/code/modules/hardsuits/_rig.dm b/code/modules/hardsuits/_rig.dm index 55f51f8b0877..6c2f3873a851 100644 --- a/code/modules/hardsuits/_rig.dm +++ b/code/modules/hardsuits/_rig.dm @@ -448,7 +448,7 @@ if(seal_delay && !instant && !do_self(M, seal_delay, DO_AFTER_IGNORE_ACTIVE_ITEM | DO_AFTER_IGNORE_MOVEMENT, NONE)) failed_to_seal = 1 - piece.copy_atom_colour(src) + piece.copy_atom_color(src) piece.icon_state = "[suit_state][is_sealing ? "_sealed" : ""]" piece.update_worn_icon() switch(msg_type) @@ -484,7 +484,7 @@ if(!piece) continue piece.icon_state = "[suit_state][is_activated() ? "_sealed" : ""]" - piece.copy_atom_colour(src) + piece.copy_atom_color(src) piece.update_worn_icon() if(is_activated()) @@ -956,7 +956,7 @@ else if (deploy_mode != ONLY_RETRACT) if(check_slot && check_slot == use_obj) return - use_obj.copy_atom_colour(src) + use_obj.copy_atom_color(src) if(!H.equip_to_slot_if_possible(use_obj, equip_to, INV_OP_FORCE)) if(check_slot && warn == 1) to_chat(H, "You are unable to deploy \the [piece] as \the [check_slot] [check_slot.gender == PLURAL ? "are" : "is"] in the way.") diff --git a/code/modules/industry/disposals/disposal/chute.dm b/code/modules/industry/disposals/disposal/chute.dm index 29fdecbfa936..2df7e71372e6 100644 --- a/code/modules/industry/disposals/disposal/chute.dm +++ b/code/modules/industry/disposals/disposal/chute.dm @@ -17,7 +17,6 @@ desc = "A pneumatic waste disposal unit." icon = 'icons/obj/pipes/disposal.dmi' icon_state = "disposal" - atom_colouration_system = FALSE anchored = TRUE density = TRUE pass_flags_self = ATOM_PASS_OVERHEAD_THROW diff --git a/code/modules/loadout/loadout_tweak.dm b/code/modules/loadout/loadout_tweak.dm index 6f2130de6834..d7f01d6f50d7 100644 --- a/code/modules/loadout/loadout_tweak.dm +++ b/code/modules/loadout/loadout_tweak.dm @@ -57,7 +57,7 @@ if(!metadata || (metadata == "#ffffff")) return if(istype(I)) - I.add_atom_colour(metadata, FIXED_COLOUR_PRIORITY) + I.add_atom_color(metadata) else I.color = metadata // fuck off underwear diff --git a/code/modules/mob/living/silicon/pai/defense.dm b/code/modules/mob/living/silicon/pai/defense.dm index 0f2fdba52a16..e93c9e20ae69 100644 --- a/code/modules/mob/living/silicon/pai/defense.dm +++ b/code/modules/mob/living/silicon/pai/defense.dm @@ -27,7 +27,7 @@ var/obj/item/clothing/under/U = C if(istype(U)) uploaded_snowflake_worn_state = U.snowflake_worn_state - uploaded_color = W.get_atom_colour() + uploaded_color = W.get_atom_color() to_chat(user, "You successfully upload the [W.name] to [src].") to_chat(src, "[user] has successfully uploaded the [W.name] to you.") diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index e2defee3997a..c928d6ce3a8f 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -438,7 +438,7 @@ new_clothing.desc = src.desc new_clothing.icon = icon new_clothing.icon_state = state - new_clothing.add_atom_colour(uploaded_color, FIXED_COLOUR_PRIORITY) + new_clothing.add_atom_color(uploaded_color) var/obj/item/clothing/under/U = new_clothing if(istype(U)) diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 93d40d40da3f..294322089dde 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -12,7 +12,6 @@ generic_canpass = FALSE sight = SIGHT_FLAGS_DEFAULT rad_flags = NONE - atom_colouration_system = TRUE //? Core /// mobs use ids as ref tags instead of actual refs. diff --git a/code/modules/organs/internal/species/xenos.dm b/code/modules/organs/internal/species/xenos.dm index 3739c4301780..fbfbe2980ce8 100644 --- a/code/modules/organs/internal/species/xenos.dm +++ b/code/modules/organs/internal/species/xenos.dm @@ -21,7 +21,7 @@ if(ishuman(owner)) var/mob/living/carbon/human/H = owner if(H.species.blood_color) - add_atom_colour(H.species.blood_color, FIXED_COLOUR_PRIORITY) + add_atom_color(H.species.blood_color) /obj/item/organ/internal/xenos/plasmavessel name = "plasma vessel" @@ -64,7 +64,7 @@ if(ishuman(owner)) var/mob/living/carbon/human/H = owner if(H.species.blood_color) - add_atom_colour(H.species.blood_color, FIXED_COLOUR_PRIORITY) + add_atom_color(H.species.blood_color) /obj/item/organ/internal/xenos/plasmavessel/queen name = "bloated plasma vessel" @@ -103,7 +103,7 @@ if(ishuman(owner)) var/mob/living/carbon/human/H = owner if(H.species.blood_color) - add_atom_colour(H.species.blood_color, FIXED_COLOUR_PRIORITY) + add_atom_color(H.species.blood_color) /obj/item/organ/internal/xenos/hivenode name = "hive node" @@ -122,7 +122,7 @@ if(ishuman(owner)) var/mob/living/carbon/human/H = owner if(H.species.blood_color) - add_atom_colour(H.species.blood_color, FIXED_COLOUR_PRIORITY) + add_atom_color(H.species.blood_color) /obj/item/organ/internal/xenos/resinspinner name = "resin spinner" @@ -153,7 +153,7 @@ if(ishuman(owner)) var/mob/living/carbon/human/H = owner if(H.species.blood_color) - add_atom_colour(H.species.blood_color, FIXED_COLOUR_PRIORITY) + add_atom_color(H.species.blood_color) /obj/item/organ/internal/heart/xenomorph name = "xenomorph heart" diff --git a/code/modules/organs/internal/subtypes/kidneys.dm b/code/modules/organs/internal/subtypes/kidneys.dm index 88ee1c7a1984..e8ccb9d844c0 100644 --- a/code/modules/organs/internal/subtypes/kidneys.dm +++ b/code/modules/organs/internal/subtypes/kidneys.dm @@ -55,4 +55,4 @@ if(ishuman(owner)) var/mob/living/carbon/human/H = owner if(H.species.blood_color) - add_atom_colour(H.species.blood_color, FIXED_COLOUR_PRIORITY) + add_atom_color(H.species.blood_color) diff --git a/code/modules/organs/internal/subtypes/lungs.dm b/code/modules/organs/internal/subtypes/lungs.dm index 4ec5890f29d8..413fcc66baeb 100644 --- a/code/modules/organs/internal/subtypes/lungs.dm +++ b/code/modules/organs/internal/subtypes/lungs.dm @@ -65,4 +65,4 @@ if(ishuman(owner)) var/mob/living/carbon/human/H = owner if(H.species.blood_color) - add_atom_colour(H.species.blood_color, FIXED_COLOUR_PRIORITY) + add_atom_color(H.species.blood_color) diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 079aaea6ac96..623a90364a41 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -48,7 +48,6 @@ GLOBAL_LIST_INIT(possible_cable_coil_colours, list( desc = "A flexible superconducting cable for heavy-duty power transfer." icon = 'icons/obj/power_cond_white.dmi' icon_state = "0-1" - atom_colouration_system = FALSE plane = TURF_PLANE layer = EXPOSED_WIRE_LAYER @@ -76,7 +75,7 @@ GLOBAL_LIST_INIT(possible_cable_coil_colours, list( . = ..() if(_color) - add_atom_colour(GLOB.possible_cable_coil_colours[_color] || COLOR_RED, FIXED_COLOUR_PRIORITY) + add_atom_color(GLOB.possible_cable_coil_colours[_color] || COLOR_RED) if(_d1 || _d2) d1 = _d1 @@ -566,7 +565,7 @@ GLOBAL_LIST_INIT(possible_cable_coil_colours, list( /obj/item/stack/cable_coil/Initialize(mapload, new_amount = MAXCOIL, merge, param_color) . = ..() if (param_color) // It should be red by default, so only recolor it if parameter was specified. - add_atom_colour(param_color, FIXED_COLOUR_PRIORITY) + add_atom_color(param_color) pixel_x = rand(-2,2) pixel_y = rand(-2,2) update_icon() diff --git a/code/modules/projectiles/unsorted/magic.dm b/code/modules/projectiles/unsorted/magic.dm index 591456b22987..163f16804028 100644 --- a/code/modules/projectiles/unsorted/magic.dm +++ b/code/modules/projectiles/unsorted/magic.dm @@ -283,7 +283,7 @@ S.icon_state = P.icon_state S.copy_overlays(P, TRUE) S.color = P.color - S.atom_colours = P.atom_colours.Copy() + S.atom_colors = P.atom_colors.Copy() if(L.mind) L.mind.transfer(S) if(owner) diff --git a/code/modules/vehicles/ridden/boat.dm b/code/modules/vehicles/ridden/boat.dm index e76981d65c87..dc364cfb8d00 100644 --- a/code/modules/vehicles/ridden/boat.dm +++ b/code/modules/vehicles/ridden/boat.dm @@ -20,7 +20,7 @@ if(!material) qdel(src) return - add_atom_colour(material.icon_colour, FIXED_COLOUR_PRIORITY) + add_atom_color(material.icon_colour) /obj/vehicle/ridden/boat/drive_check(mob/user) return !!user.get_held_item_of_type(/obj/item/oar) @@ -83,7 +83,7 @@ if(!material) qdel(src) return - add_atom_colour(material.icon_colour, FIXED_COLOUR_PRIORITY) + add_atom_color(material.icon_colour) /obj/item/oar/ashlander name = "blessed oar" diff --git a/code/modules/xenobio2/mob/xeno.dm b/code/modules/xenobio2/mob/xeno.dm index 6b9cef60afb4..a2cd4799c3e5 100644 --- a/code/modules/xenobio2/mob/xeno.dm +++ b/code/modules/xenobio2/mob/xeno.dm @@ -79,7 +79,7 @@ Also includes Life and New ProcessTraits() . =..() if(colored) - add_atom_colour(traitdat.get_trait(TRAIT_XENO_COLOR), FIXED_COLOUR_PRIORITY) + add_atom_color(traitdat.get_trait(TRAIT_XENO_COLOR)) create_reagents(internal_vol) temp_chem_holder = new() temp_chem_holder.create_reagents(20)