From 7da2c74881c4c94bfdf5e2dbc835925f445c07ab Mon Sep 17 00:00:00 2001 From: Iajret Creature <122297233+Steals-The-PRs@users.noreply.github.com> Date: Sun, 24 Mar 2024 20:12:56 +0300 Subject: [PATCH] [MIRROR] Refactor removing unused defines. (#1590) (#2537) * Refactor removing unused defines. * Update lighting.dm * Update machines.dm * Update stun.dm * Update liquid_effect.dm * Update modular_nova/modules/liquids/code/liquid_systems/liquid_effect.dm --------- Co-authored-by: NovaBot <154629622+NovaBot13@users.noreply.github.com> Co-authored-by: Bilbo367 <163439532+Bilbo367@users.noreply.github.com> Co-authored-by: SomeRandomOwl <2568378+SomeRandomOwl@users.noreply.github.com> Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> --- code/__DEFINES/DNA.dm | 1 - code/__DEFINES/ai/ai_blackboard.dm | 2 -- code/__DEFINES/ai/bot_keys.dm | 2 -- code/__DEFINES/colors.dm | 4 +-- code/__DEFINES/combat.dm | 1 - code/__DEFINES/cooldowns.dm | 1 - code/__DEFINES/cult.dm | 15 ++++------ code/__DEFINES/diseases.dm | 1 - code/__DEFINES/economy.dm | 3 -- code/__DEFINES/firealarm.dm | 7 ----- code/__DEFINES/flora.dm | 3 -- code/__DEFINES/fonts.dm | 4 --- code/__DEFINES/food.dm | 7 +---- code/__DEFINES/footsteps.dm | 4 +-- code/__DEFINES/generators.dm | 3 -- code/__DEFINES/hud.dm | 7 ----- code/__DEFINES/icon_smoothing.dm | 2 -- code/__DEFINES/language.dm | 1 - code/__DEFINES/layers.dm | 5 ---- code/__DEFINES/lighting.dm | 8 ----- code/__DEFINES/logging.dm | 2 -- code/__DEFINES/machines.dm | 5 +--- code/__DEFINES/maps.dm | 5 ---- code/__DEFINES/maths.dm | 1 - code/__DEFINES/mobs.dm | 24 --------------- code/__DEFINES/supermatter.dm | 2 +- code/__DEFINES/turfs.dm | 6 ---- code/__HELPERS/colors.dm | 2 +- code/__HELPERS/icons.dm | 12 ++++---- code/__HELPERS/mobs.dm | 4 +-- code/_onclick/hud/fullscreen.dm | 2 +- .../plane_masters/plane_master_subtypes.dm | 2 +- code/_onclick/hud/screen_objects.dm | 2 +- code/datums/actions/mobs/blood_warp.dm | 2 +- code/datums/actions/mobs/charge.dm | 2 +- code/datums/actions/mobs/lava_swoop.dm | 2 +- code/datums/dna.dm | 2 +- code/datums/elements/ridable.dm | 2 +- code/datums/id_trim/centcom.dm | 2 +- code/datums/martial/sleeping_carp.dm | 2 +- code/datums/materials/basemats.dm | 4 +-- code/datums/mutations/hulk.dm | 2 +- .../dna_infuser/organ_sets/goliath_organs.dm | 6 ++-- .../dna_infuser/organ_sets/gondola_organs.dm | 4 +-- .../dna_infuser/organ_sets/rat_organs.dm | 6 ++-- code/game/machinery/doors/airlock.dm | 2 +- code/game/machinery/doors/windowdoor.dm | 2 +- code/game/machinery/shieldgen.dm | 2 +- .../anomalies/anomalies_dimensional_themes.dm | 2 +- code/game/objects/effects/decals/crayon.dm | 2 +- .../effects/decals/turfdecal/markings.dm | 4 +-- .../effects/decals/turfdecal/tilecoloring.dm | 4 +-- .../fluid_spread/effects_smoke.dm | 2 +- code/game/objects/effects/spawners/costume.dm | 2 +- code/game/objects/effects/wanted_poster.dm | 4 +-- .../objects/items/AI_modules/_AI_modules.dm | 2 +- code/game/objects/items/cards_ids.dm | 10 +++---- code/game/objects/items/crayons.dm | 8 ++--- code/game/objects/items/credit_holochip.dm | 2 +- .../objects/items/devices/quantum_keycard.dm | 2 +- code/game/objects/items/devices/spyglasses.dm | 2 +- code/game/objects/items/dna_probe.dm | 2 +- code/game/objects/items/food/meatslab.dm | 2 +- code/game/objects/items/melee/misc.dm | 2 +- code/game/objects/items/plushes.dm | 2 +- code/game/objects/items/stacks/wrap.dm | 4 +-- .../objects/structures/cannons/cannonballs.dm | 2 +- code/game/objects/structures/fans.dm | 2 +- code/game/objects/structures/mystery_box.dm | 2 +- code/modules/admin/verbs/secrets.dm | 2 +- .../antagonists/blob/blobstrains/_reagent.dm | 2 +- code/modules/antagonists/cult/blood_magic.dm | 4 +-- code/modules/antagonists/cult/cult.dm | 4 +-- .../antagonists/fugitive/fugitive_outfits.dm | 8 ++--- .../nightmare/nightmare_equipment.dm | 2 +- .../antagonists/nightmare/nightmare_organs.dm | 2 +- .../equipment/nuclear_authentication_disk.dm | 2 +- .../antagonists/revolution/revolution.dm | 2 +- .../antagonists/space_dragon/space_dragon.dm | 4 +-- code/modules/art/paintings.dm | 2 +- code/modules/asset_cache/assets/vending.dm | 2 +- .../atmospherics/gasmixtures/gas_types.dm | 10 +++---- .../atmospherics/machinery/datum_pipeline.dm | 4 +-- .../atmospherics/machinery/other/miner.dm | 4 +-- code/modules/bitrunning/util/service_style.dm | 2 +- code/modules/cargo/supplypod.dm | 4 +-- code/modules/clothing/head/jobs.dm | 2 +- code/modules/clothing/head/wig.dm | 4 +-- code/modules/clothing/masks/costume.dm | 2 +- code/modules/clothing/neck/_neck.dm | 2 +- code/modules/clothing/neck/collar_bomb.dm | 2 +- code/modules/clothing/outfits/event.dm | 4 +-- code/modules/clothing/spacesuits/plasmamen.dm | 2 +- code/modules/clothing/suits/shirt.dm | 2 +- code/modules/events/aurora_caelus.dm | 4 +-- code/modules/events/portal_storm.dm | 2 +- code/modules/experisci/handheld_scanner.dm | 4 +-- code/modules/fishing/fishing_equipment.dm | 2 +- .../food_and_drinks/recipes/soup_mixtures.dm | 6 ++-- code/modules/hallucination/stray_bullet.dm | 2 +- .../hydroponics/grown/rainbow_bunch.dm | 4 +-- code/modules/mob/dead/observer/observer.dm | 2 +- code/modules/mob/living/basic/bots/_bots.dm | 2 +- .../basic/guardian/guardian_types/charger.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 4 +-- .../mob/living/carbon/human/human_defines.dm | 10 +++---- .../carbon/human/species_types/vampire.dm | 4 +-- .../mob/living/simple_animal/bot/bot.dm | 2 +- .../mob/living/simple_animal/bot/secbot.dm | 2 +- .../hostile/mining_mobs/elites/elite.dm | 6 ++-- .../mining_mobs/elites/goliath_broodmother.dm | 4 +-- code/modules/mod/mod_control.dm | 2 +- .../computers/item/computer.dm | 2 +- code/modules/pai/hud.dm | 2 +- code/modules/paperwork/pen.dm | 28 ++++++++--------- code/modules/plumbing/plumbers/synthesizer.dm | 2 +- .../power/lighting/light_mapping_helpers.dm | 6 ++-- .../guns/energy/kinetic_accelerator.dm | 2 +- .../projectiles/guns/special/hand_of_midas.dm | 2 +- code/modules/projectiles/pins.dm | 4 +-- .../projectile/bullets/cannonball.dm | 2 +- .../projectiles/projectile/bullets/shotgun.dm | 2 +- .../projectile/energy/nuclear_particle.dm | 12 ++++---- .../projectiles/projectile/energy/stun.dm | 3 +- .../projectiles/projectile/special/gravity.dm | 4 +-- .../projectile/special/wormhole.dm | 2 +- .../reagents/chemistry/holder/ui_data.dm | 2 +- code/modules/reagents/chemistry/reagents.dm | 2 +- .../chemistry/reagents/atmos_gas_reagents.dm | 2 +- .../reagents/drinks/alcohol_reagents.dm | 16 +++++----- .../reagents/drinks/drink_reagents.dm | 6 ++-- .../chemistry/reagents/drug_reagents.dm | 2 +- .../chemistry/reagents/food_reagents.dm | 18 +++++------ .../chemistry/reagents/medicine_reagents.dm | 8 ++--- .../chemistry/reagents/other_reagents.dm | 30 +++++++++---------- .../reagents/pyrotechnic_reagents.dm | 10 +++---- .../chemistry/reagents/toxin_reagents.dm | 8 ++--- .../religion/festival/instrument_rites.dm | 2 +- .../religion/sparring/ceremonial_gear.dm | 2 +- .../xenobiology/crossbreeding/__corecross.dm | 28 ++++++++--------- .../xenobiology/crossbreeding/_clothing.dm | 2 +- .../xenobiology/crossbreeding/_potions.dm | 4 +-- .../crossbreeding/_status_effects.dm | 2 +- .../xenobiology/crossbreeding/consuming.dm | 12 ++++---- .../xenobiology/crossbreeding/prismatic.dm | 20 ++++++------- .../xenobiology/crossbreeding/regenerative.dm | 2 +- .../research/xenobiology/xenobiology.dm | 4 +-- code/modules/shuttle/special.dm | 4 +-- .../modules/spells/spell_types/self/mutate.dm | 2 +- code/modules/surgery/bodyparts/head.dm | 4 +-- .../internal/cyberimp/augments_internal.dm | 4 +-- code/modules/unit_tests/changeling.dm | 4 +-- .../code/liquid_systems/liquid_effect.dm | 2 +- tgstation.dme | 1 - 154 files changed, 288 insertions(+), 388 deletions(-) delete mode 100644 code/__DEFINES/flora.dm diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm index f756678b43a..79501638eec 100644 --- a/code/__DEFINES/DNA.dm +++ b/code/__DEFINES/DNA.dm @@ -111,7 +111,6 @@ #define ORGAN_SLOT_EXTERNAL_HORNS "horns" #define ORGAN_SLOT_EXTERNAL_WINGS "wings" #define ORGAN_SLOT_EXTERNAL_ANTENNAE "antennae" -#define ORGAN_SLOT_EXTERNAL_BODYMARKINGS "bodymarkings" #define ORGAN_SLOT_EXTERNAL_POD_HAIR "pod_hair" /// Xenomorph organ slots diff --git a/code/__DEFINES/ai/ai_blackboard.dm b/code/__DEFINES/ai/ai_blackboard.dm index 6dc90ea4d64..df9b8be1075 100644 --- a/code/__DEFINES/ai/ai_blackboard.dm +++ b/code/__DEFINES/ai/ai_blackboard.dm @@ -6,8 +6,6 @@ #define BB_NEXT_HUNGRY "BB_NEXT_HUNGRY" ///what we're going to eat next #define BB_FOOD_TARGET "bb_food_target" -///Path we should use next time we use the JPS movement datum -#define BB_PATH_TO_USE "BB_path_to_use" ///How close a mob must be for us to select it as a target, if that is less than how far we can maintain it as a target #define BB_AGGRO_RANGE "BB_aggro_range" ///are we hungry? determined by the udder compnent diff --git a/code/__DEFINES/ai/bot_keys.dm b/code/__DEFINES/ai/bot_keys.dm index 3c9a8551f50..8a46d156114 100644 --- a/code/__DEFINES/ai/bot_keys.dm +++ b/code/__DEFINES/ai/bot_keys.dm @@ -15,8 +15,6 @@ #define BB_RADIO_CHANNEL "radio_channel" ///list of unreachable things we will temporarily ignore #define BB_TEMPORARY_IGNORE_LIST "temporary_ignore_list" -///Last thing we attempted to reach -#define BB_LAST_ATTEMPTED_PATHING "last_attempted_pathing" // medbot keys ///the patient we must heal diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm index bcb63c15382..d1f489f0555 100644 --- a/code/__DEFINES/colors.dm +++ b/code/__DEFINES/colors.dm @@ -39,14 +39,14 @@ #define COLOR_ETHIOPIA_RED "#DA121A" #define COLOR_UNION_JACK_RED "#C8102E" #define COLOR_MEDIUM_DARK_RED "#CC0000" -#define COLOR_PINK_RED "EF3340" +#define COLOR_PINK_RED "#EF3340" #define COLOR_SYNDIE_RED "#F10303" #define COLOR_SYNDIE_RED_HEAD "#760500" #define COLOR_MOSTLY_PURE_RED "#FF3300" #define COLOR_DARK_RED "#A50824" #define COLOR_RED_LIGHT "#FF3333" -#define COLOR_FIRE_LIGHT_RED "#B61C1C" #define COLOR_MAROON "#800000" +#define COLOR_FIRE_LIGHT_RED "#B61C1C" #define COLOR_SECURITY_RED "#CB0000" #define COLOR_VIVID_RED "#FF3232" #define COLOR_LIGHT_GRAYISH_RED "#E4C7C5" diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index e97653e5022..e9b6d0ce314 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -274,7 +274,6 @@ GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list( #define GRENADE_CLUMSY_FUMBLE 1 #define GRENADE_NONCLUMSY_FUMBLE 2 -#define GRENADE_NO_FUMBLE 3 #define BODY_ZONE_HEAD "head" #define BODY_ZONE_CHEST "chest" diff --git a/code/__DEFINES/cooldowns.dm b/code/__DEFINES/cooldowns.dm index 3335ac50fc4..1d160a8c0f1 100644 --- a/code/__DEFINES/cooldowns.dm +++ b/code/__DEFINES/cooldowns.dm @@ -32,7 +32,6 @@ //Mecha cooldowns #define COOLDOWN_MECHA_MESSAGE "mecha_message" #define COOLDOWN_MECHA_EQUIPMENT(type) ("mecha_equip_[type]") -#define COOLDOWN_MECHA_ARMOR "mecha_armor" #define COOLDOWN_MECHA_MELEE_ATTACK "mecha_melee" #define COOLDOWN_MECHA_SMOKE "mecha_smoke" #define COOLDOWN_MECHA_SKYFALL "mecha_skyfall" diff --git a/code/__DEFINES/cult.dm b/code/__DEFINES/cult.dm index 8042b438ff7..3e0395eab4e 100644 --- a/code/__DEFINES/cult.dm +++ b/code/__DEFINES/cult.dm @@ -1,13 +1,12 @@ //rune colors, for easy reference -#define RUNE_COLOR_TALISMAN "#0000FF" -#define RUNE_COLOR_TELEPORT "#551A8B" -#define RUNE_COLOR_OFFER "#FFFFFF" +#define RUNE_COLOR_TALISMAN COLOR_BLUE +#define RUNE_COLOR_TELEPORT COLOR_DARK_PURPLE +#define RUNE_COLOR_OFFER COLOR_WHITE #define RUNE_COLOR_DARKRED "#7D1717" #define RUNE_COLOR_MEDIUMRED "#C80000" #define RUNE_COLOR_BURNTORANGE "#CC5500" -#define RUNE_COLOR_RED "#FF0000" -#define RUNE_COLOR_EMP "#4D94FF" -#define RUNE_COLOR_SUMMON "#00FF00" +#define RUNE_COLOR_RED COLOR_RED +#define RUNE_COLOR_SUMMON COLOR_VIBRANT_LIME //blood magic #define MAX_BLOODCHARGE 4 @@ -22,11 +21,9 @@ #define IRON_TO_CONSTRUCT_SHELL_CONVERSION 50 //screen locations #define DEFAULT_BLOODSPELLS "6:-29,4:-2" -#define DEFAULT_BLOODTIP "14:6,14:27" -#define DEFAULT_TOOLTIP "6:-29,5:-2" //misc #define SOULS_TO_REVIVE 3 -#define BLOODCULT_EYE "#FF0000" +#define BLOODCULT_EYE COLOR_RED //soulstone & construct themes #define THEME_CULT "cult" #define THEME_WIZARD "wizard" diff --git a/code/__DEFINES/diseases.dm b/code/__DEFINES/diseases.dm index 61a136c70d2..047bb79582d 100644 --- a/code/__DEFINES/diseases.dm +++ b/code/__DEFINES/diseases.dm @@ -1,4 +1,3 @@ - #define DISEASE_LIMIT 1 #define VIRUS_SYMPTOM_LIMIT 6 diff --git a/code/__DEFINES/economy.dm b/code/__DEFINES/economy.dm index 32408e4f538..476c98b40d6 100644 --- a/code/__DEFINES/economy.dm +++ b/code/__DEFINES/economy.dm @@ -63,9 +63,6 @@ #define CIV_JOB_ATMOS 13 #define CIV_JOB_RANDOM 14 -//By how much should the station's inflation value be multiplied by when dividing the civilian bounty's reward? -#define BOUNTY_MULTIPLIER 10 - //These defines are to be used to with the payment component, determines which lines will be used during a transaction. If in doubt, go with clinical. #define PAYMENT_CLINICAL "clinical" #define PAYMENT_FRIENDLY "friendly" diff --git a/code/__DEFINES/firealarm.dm b/code/__DEFINES/firealarm.dm index f2a561d12d2..0e1c4bd9433 100644 --- a/code/__DEFINES/firealarm.dm +++ b/code/__DEFINES/firealarm.dm @@ -1,10 +1,3 @@ -//A set of defines to be sent by fire alarms. The signals are sent to the alarm's area, but are read and used by the firelocks of the area, and are used for mass changes in fire detection. -///Sent when a fire alarm is emagged -#define FIRE_DETECT_EMAG "fire_detect_emag" -///Sent when the fire detection of an area is disabled -#define FIRE_DETECT_STOP "fire_detect_stop" -///Sent when the fire detection of an area is enabled -#define FIRE_DETECT_START "fire_detect_start" ///Designates a fire lock should be closed due to HEAT #define FIRELOCK_ALARM_TYPE_HOT "firelock_alarm_type_hot" ///Designates a fire lock should be closed due to COLD diff --git a/code/__DEFINES/flora.dm b/code/__DEFINES/flora.dm deleted file mode 100644 index e02f492cce7..00000000000 --- a/code/__DEFINES/flora.dm +++ /dev/null @@ -1,3 +0,0 @@ -///Tools that can harvest wood that DONT have the TOOL_SAW flag; TOOL_SAW can harvest regardless of being in this list (Dont put them in here) -#define FLORA_HARVEST_WOOD_TOOLS list(/obj/item/hatchet, /obj/item/fireaxe, /obj/item/kinetic_crusher, /obj/item/melee/energy/axe) -#define FLORA_HARVEST_STONE_TOOLS list(/obj/item/pickaxe) diff --git a/code/__DEFINES/fonts.dm b/code/__DEFINES/fonts.dm index 14c221b22fa..cc7bc5a4e22 100644 --- a/code/__DEFINES/fonts.dm +++ b/code/__DEFINES/fonts.dm @@ -18,7 +18,3 @@ // Font metrics bitfield /// Include leading A width and trailing C width in GetWidth() or in DrawText() #define INCLUDE_AC (1<<0) - -DEFINE_BITFIELD(font_flags, list( - "INCLUDE_AC" = INCLUDE_AC, -)) diff --git a/code/__DEFINES/food.dm b/code/__DEFINES/food.dm index e1c9185914f..9b5d23d38eb 100644 --- a/code/__DEFINES/food.dm +++ b/code/__DEFINES/food.dm @@ -103,6 +103,7 @@ DEFINE_BITFIELD(foodtypes, list( #define DRINK_GOOD 3 #define DRINK_VERYGOOD 4 #define DRINK_FANTASTIC 5 + #define FOOD_AMAZING 6 #define RACE_DRINK 7 // SKYRAT ADDITION @@ -184,20 +185,16 @@ DEFINE_BITFIELD(food_flags, list( #define STOP_SERVING_BREAKFAST (35 MINUTES) // NOVA EDIT - ORIGINAL: 15 MINUTES -#define FOOD_MEAT_NORMAL 5 #define FOOD_MEAT_HUMAN 50 #define FOOD_MEAT_MUTANT 100 #define FOOD_MEAT_MUTANT_RARE 200 #define IS_EDIBLE(O) (O.GetComponent(/datum/component/edible)) - ///Food trash flags #define FOOD_TRASH_POPABLE (1<<0) #define FOOD_TRASH_OPENABLE (1<<1) - - ///Food preference enums #define FOOD_LIKED 1 #define FOOD_DISLIKED 2 @@ -207,8 +204,6 @@ DEFINE_BITFIELD(food_flags, list( ///Venue reagent requirement #define VENUE_BAR_MINIMUM_REAGENTS 10 - - ///***Food price classes*** ///Foods that are meant to have no value, such as lollypops from medborgs. #define FOOD_PRICE_WORTHLESS 0 diff --git a/code/__DEFINES/footsteps.dm b/code/__DEFINES/footsteps.dm index c8b89b082a4..a8a7ad975af 100644 --- a/code/__DEFINES/footsteps.dm +++ b/code/__DEFINES/footsteps.dm @@ -38,14 +38,13 @@ #define STEP_SOUND_PRIORITY "step_sound_priority" /* +Below is how the following lists are defined id = list( list(sounds), base volume, extra range addition ) - - */ GLOBAL_LIST_INIT(footstep, list( @@ -102,6 +101,7 @@ GLOBAL_LIST_INIT(footstep, list( 'sound/effects/footstep/catwalk4.ogg', 'sound/effects/footstep/catwalk5.ogg'), 100, 1), )) + //bare footsteps lists GLOBAL_LIST_INIT(barefootstep, list( FOOTSTEP_WOOD_BAREFOOT = list(list( diff --git a/code/__DEFINES/generators.dm b/code/__DEFINES/generators.dm index e9d373c9a65..3ad34d39f2c 100644 --- a/code/__DEFINES/generators.dm +++ b/code/__DEFINES/generators.dm @@ -2,11 +2,8 @@ #define GEN_NUM "num" #define GEN_VECTOR "vector" #define GEN_BOX "box" -#define GEN_COLOR "color" #define GEN_CIRCLE "circle" #define GEN_SPHERE "sphere" -#define GEN_SQUARE "square" -#define GEN_CUBE "cube" ///particle editor var modifiers #define P_DATA_GENERATOR "generator" diff --git a/code/__DEFINES/hud.dm b/code/__DEFINES/hud.dm index a4d826d87ca..8a695c99d5e 100644 --- a/code/__DEFINES/hud.dm +++ b/code/__DEFINES/hud.dm @@ -110,12 +110,6 @@ #define ui_living_pull "EAST-1:28,CENTER-3:15" #define ui_living_healthdoll "EAST-1:28,CENTER-1:15" -//Monkeys -#define ui_monkey_head "CENTER-5:13,SOUTH:5" -#define ui_monkey_mask "CENTER-4:14,SOUTH:5" -#define ui_monkey_neck "CENTER-3:15,SOUTH:5" -#define ui_monkey_back "CENTER-2:16,SOUTH:5" - //Drones #define ui_drone_drop "CENTER+1:18,SOUTH:5" #define ui_drone_pull "CENTER+1.5:2,SOUTH:5" @@ -171,7 +165,6 @@ #define ui_ai_add_multicam "BOTTOM+1:6,LEFT" #define ui_ai_take_picture "BOTTOM+2:6,LEFT" - //pAI #define ui_pai_software "SOUTH:6,WEST" #define ui_pai_shell "SOUTH:6,WEST+1" diff --git a/code/__DEFINES/icon_smoothing.dm b/code/__DEFINES/icon_smoothing.dm index 9cf7bba2dd7..9c3feb8b24c 100644 --- a/code/__DEFINES/icon_smoothing.dm +++ b/code/__DEFINES/icon_smoothing.dm @@ -174,8 +174,6 @@ DEFINE_BITFIELD(smoothing_junction, list( #define SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM S_OBJ(24) ///turf/closed/indestructible/opsglass, /obj/structure/window/reinforced/plasma/plastitanium #define SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE S_OBJ(25) ///obj/structure/window/reinforced/shuttle -#define SMOOTH_GROUP_WINDOW_DIRECTIONAL_TRAM S_OBJ(26) ///obj/structure/tram - #define SMOOTH_GROUP_LATTICE S_OBJ(31) ///obj/structure/lattice #define SMOOTH_GROUP_CATWALK S_OBJ(32) ///obj/structure/lattice/catwalk diff --git a/code/__DEFINES/language.dm b/code/__DEFINES/language.dm index 5b1082f606d..cd6ee5ec0c9 100644 --- a/code/__DEFINES/language.dm +++ b/code/__DEFINES/language.dm @@ -22,7 +22,6 @@ // Only ever goes away when dismissed directly. #define LANGUAGE_ABSORB "absorb" #define LANGUAGE_APHASIA "aphasia" -#define LANGUAGE_CTF "ctf" #define LANGUAGE_CULTIST "cultist" #define LANGUAGE_CURATOR "curator" #define LANGUAGE_GLAND "gland" diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index 0a9ea44aaa8..9b5f73aa7fa 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -174,7 +174,6 @@ #define DOOR_HELPER_LAYER 2.72 //keep this above DOOR_ACCESS_HELPER_LAYER and OPEN_DOOR_LAYER since the others tend to have tiny sprites that tend to be covered up. #define PROJECTILE_HIT_THRESHHOLD_LAYER 2.75 //projectiles won't hit objects at or below this layer if possible #define TABLE_LAYER 2.8 -#define GATEWAY_UNDERLAY_LAYER 2.85 #define BELOW_OBJ_LAYER 2.9 #define LOW_ITEM_LAYER 2.95 //#define OBJ_LAYER 3 //For easy recordkeeping; this is a byond define @@ -240,7 +239,6 @@ /// Stuff that needs to draw above everything else on this plane #define LIGHTING_ABOVE_ALL 20 - //---------- EMISSIVES ------------- //Layering order of these is not particularly meaningful. //Important part is the seperation of the planes for control via plane_master @@ -280,9 +278,6 @@ /// Layer for light overlays #define LIGHT_DEBUG_LAYER 6 -#define LOBBY_BACKGROUND_LAYER 3 -#define LOBBY_BUTTON_LAYER 4 - ///Layer for lobby menu collapse button #define LOBBY_BELOW_MENU_LAYER 2 ///Layer for lobby menu background image and main buttons (Join/Ready, Observe, Charater Prefs) diff --git a/code/__DEFINES/lighting.dm b/code/__DEFINES/lighting.dm index e90b37db728..dbd768f01e4 100644 --- a/code/__DEFINES/lighting.dm +++ b/code/__DEFINES/lighting.dm @@ -18,16 +18,8 @@ /// Does this light ignore inherent offsets? (Pixels, transforms, etc) #define LIGHT_IGNORE_OFFSET (1<<2) -// Bay lighting engine shit, not in /code/modules/lighting because BYOND is being shit about it -/// frequency, in 1/10ths of a second, of the lighting process -#define LIGHTING_INTERVAL 5 - #define MINIMUM_USEFUL_LIGHT_RANGE 1.5 // NOVA EDIT CHANGE - Original value 1.4 -/// type of falloff to use for lighting; 1 for circular, 2 for square -#define LIGHTING_FALLOFF 1 -/// use lambertian shading for light sources -#define LIGHTING_LAMBERTIAN 0 /// light UNDER the floor. primarily used for starlight, shouldn't fuck with this #define LIGHTING_HEIGHT_SPACE -0.5 /// light ON the floor diff --git a/code/__DEFINES/logging.dm b/code/__DEFINES/logging.dm index d4730ce0bb7..c2f0999a34f 100644 --- a/code/__DEFINES/logging.dm +++ b/code/__DEFINES/logging.dm @@ -25,7 +25,6 @@ #define INVESTIGATE_RADIATION "radiation" #define INVESTIGATE_RECORDS "records" #define INVESTIGATE_RESEARCH "research" -#define INVESTIGATE_TRANSPORT "transport" #define INVESTIGATE_WIRES "wires" // Logging types for log_message() @@ -60,7 +59,6 @@ #define INDIVIDUAL_EMOTE_LOG (LOG_EMOTE | LOG_RADIO_EMOTE) #define INDIVIDUAL_COMMS_LOG (LOG_PDA | LOG_CHAT | LOG_COMMENT | LOG_TELECOMMS) #define INDIVIDUAL_OOC_LOG (LOG_OOC | LOG_ADMIN) -#define INDIVIDUAL_OWNERSHIP_LOG (LOG_OWNERSHIP) #define INDIVIDUAL_SHOW_ALL_LOG (LOG_ATTACK | LOG_SAY | LOG_WHISPER | LOG_EMOTE | LOG_RADIO_EMOTE | LOG_DSAY | LOG_PDA | LOG_CHAT | LOG_COMMENT | LOG_TELECOMMS | LOG_OOC | LOG_ADMIN | LOG_OWNERSHIP | LOG_GAME | LOG_ADMIN_PRIVATE | LOG_ASAY | LOG_MECHA | LOG_VIRUS | LOG_SHUTTLE | LOG_ECON | LOG_VICTIM | LOG_SPEECH_INDICATORS) #define LOGSRC_CKEY "Ckey" diff --git a/code/__DEFINES/machines.dm b/code/__DEFINES/machines.dm index 62f201f015e..65c912f666d 100644 --- a/code/__DEFINES/machines.dm +++ b/code/__DEFINES/machines.dm @@ -21,7 +21,6 @@ #define DYNAMIC_TO_STATIC_CHANNEL(dyn_channel) (dyn_channel + (AREA_USAGE_STATIC_START - AREA_USAGE_DYNAMIC_START)) #define STATIC_TO_DYNAMIC_CHANNEL(static_channel) (static_channel - (AREA_USAGE_STATIC_START - AREA_USAGE_DYNAMIC_START)) - //Power use #define NO_POWER_USE 0 #define IDLE_POWER_USE 1 @@ -52,6 +51,7 @@ #define BYPASS_DOOR_CHECKS 2 //used in design to specify which machine can build it +//Note: More than one of these can be added to a design but imprinter and lathe designs are incompatable. #define IMPRINTER (1<<0) //For circuits. Uses glass/chemicals. #define PROTOLATHE (1<<1) //New stuff. Uses various minerals #define AUTOLATHE (1<<2) //Prints basic designs without research @@ -71,9 +71,6 @@ #define COLONY_FABRICATOR (1<<11) // NOVA EDIT END -#define FIREDOOR_OPEN 1 -#define FIREDOOR_CLOSED 2 - #define HYPERTORUS_INACTIVE 0 // No or minimal energy #define HYPERTORUS_NOMINAL 1 // Normal operation #define HYPERTORUS_WARNING 2 // Integrity damaged diff --git a/code/__DEFINES/maps.dm b/code/__DEFINES/maps.dm index ca09aeb402c..7e26e30d18d 100644 --- a/code/__DEFINES/maps.dm +++ b/code/__DEFINES/maps.dm @@ -161,7 +161,6 @@ Always compile, always use that verb, and always make sure that it works for wha #define RESERVED_TURF_TYPE /turf/open/space/basic //What the turf is when not being used //Ruin Generation - #define PLACEMENT_TRIES 100 //How many times we try to fit the ruin somewhere until giving up (really should just swap to some packing algo) #define PLACE_DEFAULT "random" @@ -175,10 +174,6 @@ Always compile, always use that verb, and always make sure that it works for wha #define DEFAULT_SPACE_RUIN_LEVELS 7 #define DEFAULT_SPACE_EMPTY_LEVELS 1 -#define PERLIN_LAYER_HEIGHT "perlin_height" -#define PERLIN_LAYER_HUMIDITY "perlin_humidity" -#define PERLIN_LAYER_HEAT "perlin_heat" - #define BIOME_LOW_HEAT "low_heat" #define BIOME_LOWMEDIUM_HEAT "lowmedium_heat" #define BIOME_HIGHMEDIUM_HEAT "highmedium_heat" diff --git a/code/__DEFINES/maths.dm b/code/__DEFINES/maths.dm index ad35588f736..aca45241f1c 100644 --- a/code/__DEFINES/maths.dm +++ b/code/__DEFINES/maths.dm @@ -16,7 +16,6 @@ #define NUM_E 2.71828183 - #define PI 3.1416 #define INFINITY 1e31 //closer then enough diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 24a9811489d..af551e4f1f8 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -72,11 +72,6 @@ #define RESPIRATION_N2 (1 << 1) #define RESPIRATION_PLASMA (1 << 2) #define DEFAULT_BODYPART_ICON_ORGANIC 'icons/mob/human/bodyparts_greyscale.dmi' -#define DEFAULT_BODYPART_ICON_ROBOTIC 'icons/mob/augmentation/augments.dmi' - -#define MONKEY_BODYPART "monkey" -#define ALIEN_BODYPART "alien" -#define LARVA_BODYPART "larva" //Bodytype defines for surgery, and other misc things. ///The limb is organic. @@ -238,14 +233,6 @@ #define SCREWYHUD_DEAD 2 #define SCREWYHUD_HEALTHY 3 -//Health doll screws for human mobs -#define SCREWYDOLL_HEAD /obj/item/bodypart/head -#define SCREWYDOLL_CHEST /obj/item/bodypart/chest -#define SCREWYDOLL_L_ARM /obj/item/bodypart/arm/left -#define SCREWYDOLL_R_ARM /obj/item/bodypart/arm/right -#define SCREWYDOLL_L_LEG /obj/item/bodypart/leg/left -#define SCREWYDOLL_R_LEG /obj/item/bodypart/leg/right - //Threshold levels for beauty for humans #define BEAUTY_LEVEL_HORRID -66 #define BEAUTY_LEVEL_BAD -33 @@ -427,14 +414,6 @@ #define COOLDOWN_UPDATE_ADD_RANGED "add_ranged" #define COOLDOWN_UPDATE_SET_ENRAGE "set_enrage" #define COOLDOWN_UPDATE_ADD_ENRAGE "add_enrage" -#define COOLDOWN_UPDATE_SET_SPAWN "set_spawn" -#define COOLDOWN_UPDATE_ADD_SPAWN "add_spawn" -#define COOLDOWN_UPDATE_SET_HELP "set_help" -#define COOLDOWN_UPDATE_ADD_HELP "add_help" -#define COOLDOWN_UPDATE_SET_DASH "set_dash" -#define COOLDOWN_UPDATE_ADD_DASH "add_dash" -#define COOLDOWN_UPDATE_SET_TRANSFORM "set_transform" -#define COOLDOWN_UPDATE_ADD_TRANSFORM "add_transform" #define COOLDOWN_UPDATE_SET_CHASER "set_chaser" #define COOLDOWN_UPDATE_ADD_CHASER "add_chaser" #define COOLDOWN_UPDATE_SET_ARENA "set_arena" @@ -469,7 +448,6 @@ #define APPRENTICE_AGE_MIN 29 //youngest an apprentice can be #define SHOES_SLOWDOWN 0 //How much shoes slow you down by default. Negative values speed you up -#define SHOES_SPEED_SLIGHT SHOES_SLOWDOWN - 1 // slightest speed boost to movement #define POCKET_STRIP_DELAY (4 SECONDS) //time taken to search somebody's pockets #define DOOR_CRUSH_DAMAGE 15 //the amount of damage that airlocks deal when they crush you @@ -572,8 +550,6 @@ #define RECENT_EXAMINE_MAX_WINDOW (2 SECONDS) /// If you examine the same atom twice in this timeframe, we call examine_more() instead of examine() #define EXAMINE_MORE_WINDOW (1 SECONDS) -/// If you examine another mob who's successfully examined you during this duration of time, you two try to make eye contact. Cute! -#define EYE_CONTACT_WINDOW (2 SECONDS) /// If you yawn while someone nearby has examined you within this time frame, it will force them to yawn as well. Tradecraft! #define YAWN_PROPAGATION_EXAMINE_WINDOW (2 SECONDS) diff --git a/code/__DEFINES/supermatter.dm b/code/__DEFINES/supermatter.dm index 5eab41fcdf9..5dee00db310 100644 --- a/code/__DEFINES/supermatter.dm +++ b/code/__DEFINES/supermatter.dm @@ -181,7 +181,7 @@ /// Colours used for effects. #define SUPERMATTER_COLOUR "#ffd04f" #define SUPERMATTER_RED "#aa2c16" -#define SUPERMATTER_CASCADE_COLOUR "#333333" +#define SUPERMATTER_CASCADE_COLOUR COLOR_ALMOST_BLACK #define SUPERMATTER_TESLA_COLOUR "#00ffff" #define SUPERMATTER_SINGULARITY_RAYS_COLOUR "#750000" #define SUPERMATTER_SINGULARITY_LIGHT_COLOUR "#400060" diff --git a/code/__DEFINES/turfs.dm b/code/__DEFINES/turfs.dm index 7b972abc20c..295c09f6d46 100644 --- a/code/__DEFINES/turfs.dm +++ b/code/__DEFINES/turfs.dm @@ -64,9 +64,6 @@ /// Turf has superlube on the floor and mobs will slip even if they are crawling #define TURF_WET_SUPERLUBE (1<<4) -/// Checks if a turf is wet -#define IS_WET_OPEN_TURF(O) O.GetComponent(/datum/component/wet_floor) - /// Maximum amount of time, (in deciseconds) a tile can be wet for. #define MAXIMUM_WET_TIME (5 MINUTES) @@ -85,9 +82,6 @@ */ #define get_area(A) (isarea(A) ? A : get_step(A, 0)?.loc) -#define TEMPORARY_THERMAL_CONDUCTIVITY 1 - -#define MAX_TEMPORARY_THERMAL_CONDUCTIVITY 1 /// Turf will be passable if density is 0 #define TURF_PATHING_PASS_DENSITY 0 /// Turf will be passable depending on [CanAStarPass] return value diff --git a/code/__HELPERS/colors.dm b/code/__HELPERS/colors.dm index 9f17d4c0028..9c70cef798e 100644 --- a/code/__HELPERS/colors.dm +++ b/code/__HELPERS/colors.dm @@ -48,7 +48,7 @@ return rgb(255 - color[1], 255 - color[2], 255 - color[3]) ///Flash a color on the passed mob -/proc/flash_color(mob_or_client, flash_color="#960000", flash_time=20) +/proc/flash_color(mob_or_client, flash_color=COLOR_CULT_RED, flash_time=20) var/mob/flashed_mob if(ismob(mob_or_client)) flashed_mob = mob_or_client diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index d9d001dd62f..6ddda0b92aa 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -35,7 +35,7 @@ icon/MinColors(icon) icon/MaxColors(icon) The icon is blended with a second icon where the maximum of each RGB pixel is the result. Opacity may increase, as if the icons were blended with ICON_OR. You may supply a color in place of an icon. -icon/Opaque(background = "#000000") +icon/Opaque(background = COLOR_BLACK) All alpha values are set to 255 throughout the icon. Transparent pixels become black, or whatever background color you specify. icon/BecomeAlphaMask() You can convert a simple grayscale icon into an alpha mask to use with other icons very easily with this proc. @@ -242,8 +242,8 @@ world else // solid color new_icon = new(src) - new_icon.Blend("#000000", ICON_OVERLAY) - new_icon.SwapColor("#000000", null) + new_icon.Blend(COLOR_BLACK, ICON_OVERLAY) + new_icon.SwapColor(COLOR_BLACK, null) new_icon.Blend(icon, ICON_OVERLAY) var/icon/blend_icon = new(src) blend_icon.Opaque() @@ -251,7 +251,7 @@ world Blend(new_icon, ICON_OR) // make this icon fully opaque--transparent pixels become black -/icon/proc/Opaque(background = "#000000") +/icon/proc/Opaque(background = COLOR_BLACK) SwapColor(null, background) MapColors(1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,0, 0,0,0,1) @@ -282,7 +282,7 @@ world /// Converts a list storing hsva into an rgb color /proc/hsv2rgb(hsv) if(length(hsv) < 3) - return "#000000" + return COLOR_BLACK if(length(hsv) == 3) return rgb(hsv[1], hsv[2], hsv[3], space = COLORSPACE_HSV) return rgb(hsv[1], hsv[2], hsv[3], hsv[4], space = COLORSPACE_HSV) @@ -372,7 +372,7 @@ world var/tone_gray = TONE[1]*0.3 + TONE[2]*0.59 + TONE[3]*0.11 if(gray <= tone_gray) - return BlendRGB("#000000", tone, gray/(tone_gray || 1)) + return BlendRGB(COLOR_BLACK, tone, gray/(tone_gray || 1)) else return BlendRGB(tone, "#ffffff", (gray-tone_gray)/((255-tone_gray) || 1)) diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index 9f4fea5ed11..fdfbe11553f 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -12,7 +12,7 @@ /proc/random_eye_color() switch(pick(20;"brown",20;"hazel",20;"grey",15;"blue",15;"green",1;"amber",1;"albino")) if("brown") - return "#663300" + return COLOR_BROWNER_BROWN if("hazel") return "#554422" if("grey") @@ -26,7 +26,7 @@ if("albino") return "#" + pick("cc","dd","ee","ff") + pick("00","11","22","33","44","55","66","77","88","99") + pick("00","11","22","33","44","55","66","77","88","99") else - return "#000000" + return COLOR_BLACK /proc/random_underwear(gender) if(!GLOB.underwear_list.len) diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm index 79f857e8cbe..83ac1b8be93 100644 --- a/code/_onclick/hud/fullscreen.dm +++ b/code/_onclick/hud/fullscreen.dm @@ -187,7 +187,7 @@ icon_state = "flash" plane = SPLASHSCREEN_PLANE layer = CINEMATIC_LAYER - color = "#000000" + color = COLOR_BLACK show_when_dead = TRUE /atom/movable/screen/fullscreen/lighting_backdrop diff --git a/code/_onclick/hud/rendering/plane_masters/plane_master_subtypes.dm b/code/_onclick/hud/rendering/plane_masters/plane_master_subtypes.dm index 63206afdaa9..fa438af4b70 100644 --- a/code/_onclick/hud/rendering/plane_masters/plane_master_subtypes.dm +++ b/code/_onclick/hud/rendering/plane_masters/plane_master_subtypes.dm @@ -312,7 +312,7 @@ // Has a nice effect, makes thing stand out color = list(1.2,0,0,0, 0,1.2,0,0, 0,0,1.2,0, 0,0,0,1, 0,0,0,0) // This serves a similar purpose, I want the pipes to pop - add_filter("pipe_dropshadow", 1, drop_shadow_filter(x = -1, y= -1, size = 1, color = "#0000007A")) + add_filter("pipe_dropshadow", 1, drop_shadow_filter(x = -1, y= -1, size = 1, color = COLOR_HALF_TRANSPARENT_BLACK)) mirror_parent_hidden() /atom/movable/screen/plane_master/camera_static diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 7b0ed05318a..2a5b1cc35fd 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -217,7 +217,7 @@ item_overlay.alpha = 92 if(!holding.mob_can_equip(user, slot_id, disable_warning = TRUE, bypass_equip_delay_self = TRUE)) - item_overlay.color = "#FF0000" + item_overlay.color = COLOR_RED else item_overlay.color = "#00ff00" diff --git a/code/datums/actions/mobs/blood_warp.dm b/code/datums/actions/mobs/blood_warp.dm index 8503b360954..4b070eebfe7 100644 --- a/code/datums/actions/mobs/blood_warp.dm +++ b/code/datums/actions/mobs/blood_warp.dm @@ -34,7 +34,7 @@ return FALSE var/obj/effect/temp_visual/decoy/DA = new /obj/effect/temp_visual/decoy(owner.loc, owner) - DA.color = "#FF0000" + DA.color = COLOR_RED var/oldtransform = DA.transform DA.transform = matrix()*2 animate(DA, alpha = 255, color = initial(DA.color), transform = oldtransform, time = 3) diff --git a/code/datums/actions/mobs/charge.dm b/code/datums/actions/mobs/charge.dm index 1a3afba14d1..3cca055a541 100644 --- a/code/datums/actions/mobs/charge.dm +++ b/code/datums/actions/mobs/charge.dm @@ -104,7 +104,7 @@ return new /obj/effect/temp_visual/dragon_swoop/bubblegum(target_turf) var/obj/effect/temp_visual/decoy/D = new /obj/effect/temp_visual/decoy(charger.loc, charger) - animate(D, alpha = 0, color = "#FF0000", transform = matrix()*2, time = 3) + animate(D, alpha = 0, color = COLOR_RED, transform = matrix()*2, time = 3) /datum/action/cooldown/mob_cooldown/charge/proc/on_move(atom/source, atom/new_loc) SIGNAL_HANDLER diff --git a/code/datums/actions/mobs/lava_swoop.dm b/code/datums/actions/mobs/lava_swoop.dm index a6c8282fd10..0b0735bc471 100644 --- a/code/datums/actions/mobs/lava_swoop.dm +++ b/code/datums/actions/mobs/lava_swoop.dm @@ -193,7 +193,7 @@ plane = GAME_PLANE pixel_x = -32 pixel_y = -32 - color = "#FF0000" + color = COLOR_RED duration = 10 /obj/effect/temp_visual/dragon_flight diff --git a/code/datums/dna.dm b/code/datums/dna.dm index 2ecceaaf218..348a0015d95 100644 --- a/code/datums/dna.dm +++ b/code/datums/dna.dm @@ -86,7 +86,7 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) var/datum/species/species = new /datum/species/human /// Assoc list of feature keys to their value /// Note if you set these manually, and do not update [unique_features] afterwards, it will likely be reset. - var/list/features = list("mcolor" = "#FFFFFF") + var/list/features = list("mcolor" = COLOR_WHITE) ///Stores the hashed values of the person's non-human features var/unique_features ///Stores the real name of the person who originally got this dna datum. Used primarely for changelings, diff --git a/code/datums/elements/ridable.dm b/code/datums/elements/ridable.dm index 15b81e73f24..cbb6d7931f9 100644 --- a/code/datums/elements/ridable.dm +++ b/code/datums/elements/ridable.dm @@ -133,7 +133,7 @@ ridable_atom.AddElement(/datum/element/ridable, component_type = riding_component_type, potion_boost = TRUE) to_chat(user, span_notice("You slather the red gunk over [ridable_atom], making it faster.")) ridable_atom.remove_atom_colour(WASHABLE_COLOUR_PRIORITY) - ridable_atom.add_atom_colour("#FF0000", FIXED_COLOUR_PRIORITY) + ridable_atom.add_atom_colour(COLOR_RED, FIXED_COLOUR_PRIORITY) qdel(speed_potion) return SPEED_POTION_STOP diff --git a/code/datums/id_trim/centcom.dm b/code/datums/id_trim/centcom.dm index 7016ea5d661..5cc24f4bd6e 100644 --- a/code/datums/id_trim/centcom.dm +++ b/code/datums/id_trim/centcom.dm @@ -163,7 +163,7 @@ /datum/id_trim/centcom/ert/chaplain assignment = JOB_ERT_CHAPLAIN trim_state = "trim_chaplain" - subdepartment_color = "#58C800" + subdepartment_color = COLOR_SERVICE_LIME sechud_icon_state = SECHUD_RELIGIOUS_RESPONSE_OFFICER /datum/id_trim/centcom/ert/chaplain/New() diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index 0dd7b6dd327..800aa3ca552 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -327,7 +327,7 @@ name = "carp gloves" desc = "This gloves are capable of making people use The Sleeping Carp." icon_state = "black" - greyscale_colors = "#000000" + greyscale_colors = COLOR_BLACK cold_protection = HANDS min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT heat_protection = HANDS diff --git a/code/datums/materials/basemats.dm b/code/datums/materials/basemats.dm index e2897a772e5..f6e64d57e71 100644 --- a/code/datums/materials/basemats.dm +++ b/code/datums/materials/basemats.dm @@ -481,8 +481,8 @@ Unless you know what you're doing, only use the first three numbers. They're in /datum/material/snow name = "snow" desc = "There's no business like snow business." - color = "#FFFFFF" - greyscale_colors = "#FFFFFF" + color = COLOR_WHITE + greyscale_colors = COLOR_WHITE categories = list(MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_ITEM_MATERIAL=TRUE) sheet_type = /obj/item/stack/sheet/mineral/snow value_per_unit = 5 / SHEET_MATERIAL_AMOUNT diff --git a/code/datums/mutations/hulk.dm b/code/datums/mutations/hulk.dm index 5530a3b8311..19d173fc23a 100644 --- a/code/datums/mutations/hulk.dm +++ b/code/datums/mutations/hulk.dm @@ -26,7 +26,7 @@ return owner.add_traits(mutation_traits, GENETIC_MUTATION) for(var/obj/item/bodypart/part as anything in owner.bodyparts) - part.variable_color = "#00aa00" + part.variable_color = COLOR_DARK_LIME owner.update_body_parts() owner.add_mood_event("hulk", /datum/mood_event/hulk) RegisterSignal(owner, COMSIG_LIVING_EARLY_UNARMED_ATTACK, PROC_REF(on_attack_hand)) diff --git a/code/game/machinery/dna_infuser/organ_sets/goliath_organs.dm b/code/game/machinery/dna_infuser/organ_sets/goliath_organs.dm index 477b461bdf3..f9ccf16812b 100644 --- a/code/game/machinery/dna_infuser/organ_sets/goliath_organs.dm +++ b/code/game/machinery/dna_infuser/organ_sets/goliath_organs.dm @@ -1,6 +1,6 @@ #define GOLIATH_ORGAN_COLOR "#875652" #define GOLIATH_SCLERA_COLOR "#ac0f32" -#define GOLIATH_PUPIL_COLOR "#FF0000" +#define GOLIATH_PUPIL_COLOR COLOR_RED #define GOLIATH_COLORS GOLIATH_ORGAN_COLOR + GOLIATH_SCLERA_COLOR + GOLIATH_PUPIL_COLOR ///bonus of the goliath: you can swim through space! @@ -21,8 +21,8 @@ greyscale_config = /datum/greyscale_config/mutant_organ greyscale_colors = GOLIATH_COLORS - eye_color_left = "#FF0000" - eye_color_right = "#FF0000" + eye_color_left = COLOR_RED + eye_color_right = COLOR_RED low_light_cutoff = list(15, 0, 8) medium_light_cutoff = list(35, 15, 25) diff --git a/code/game/machinery/dna_infuser/organ_sets/gondola_organs.dm b/code/game/machinery/dna_infuser/organ_sets/gondola_organs.dm index 70dd58f9f27..96e41a57789 100644 --- a/code/game/machinery/dna_infuser/organ_sets/gondola_organs.dm +++ b/code/game/machinery/dna_infuser/organ_sets/gondola_organs.dm @@ -1,6 +1,6 @@ #define GONDOLA_ORGAN_COLOR "#7a503d" -#define GONDOLA_SCLERA_COLOR "#000000" -#define GONDOLA_PUPIL_COLOR "#000000" +#define GONDOLA_SCLERA_COLOR COLOR_BLACK +#define GONDOLA_PUPIL_COLOR COLOR_BLACK #define GONDOLA_COLORS GONDOLA_ORGAN_COLOR + GONDOLA_SCLERA_COLOR + GONDOLA_PUPIL_COLOR /* diff --git a/code/game/machinery/dna_infuser/organ_sets/rat_organs.dm b/code/game/machinery/dna_infuser/organ_sets/rat_organs.dm index 4e84870ec9c..f6e1e92c2a5 100644 --- a/code/game/machinery/dna_infuser/organ_sets/rat_organs.dm +++ b/code/game/machinery/dna_infuser/organ_sets/rat_organs.dm @@ -1,6 +1,6 @@ #define RAT_ORGAN_COLOR "#646464" #define RAT_SCLERA_COLOR "#f0e055" -#define RAT_PUPIL_COLOR "#000000" +#define RAT_PUPIL_COLOR COLOR_BLACK #define RAT_COLORS RAT_ORGAN_COLOR + RAT_SCLERA_COLOR + RAT_PUPIL_COLOR ///bonus of the rat: you can ventcrawl! @@ -16,8 +16,8 @@ name = "mutated rat-eyes" desc = "Rat DNA infused into what was once a normal pair of eyes." flash_protect = FLASH_PROTECTION_HYPER_SENSITIVE - eye_color_left = "#000000" - eye_color_right = "#000000" + eye_color_left = COLOR_BLACK + eye_color_right = COLOR_BLACK icon = 'icons/obj/medical/organs/infuser_organs.dmi' icon_state = "eyes" diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 8a8b3fb7aa2..430b0de0e46 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -2338,7 +2338,7 @@ var/atom/throwtarget throwtarget = get_edge_target_turf(src, get_dir(src, get_step_away(L, src))) SEND_SOUND(L, sound(pick('sound/hallucinations/turn_around1.ogg','sound/hallucinations/turn_around2.ogg'),0,1,50)) - flash_color(L, flash_color="#960000", flash_time=20) + flash_color(L, flash_color=COLOR_CULT_RED, flash_time=20) L.Paralyze(40) L.throw_at(throwtarget, 5, 1) return FALSE diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index bbe443bf380..1dc343a0c0b 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -317,7 +317,7 @@ transfer_fingerprints_to(debris) /obj/machinery/door/window/narsie_act() - add_atom_colour("#7D1919", FIXED_COLOUR_PRIORITY) + add_atom_colour(NARSIE_WINDOW_COLOUR, FIXED_COLOUR_PRIORITY) /obj/machinery/door/window/should_atmos_process(datum/gas_mixture/air, exposed_temperature) return (exposed_temperature > T0C + (reinf ? 1600 : 800)) diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index cb6c44cf765..fada2550816 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -94,7 +94,7 @@ /obj/structure/emergency_shield/cult/weak name = "Invoker's Shield" desc = "A weak shield summoned by cultists to protect them while they carry out delicate rituals." - color = "#FF0000" + color = COLOR_RED max_integrity = 20 mouse_opacity = MOUSE_OPACITY_TRANSPARENT layer = ABOVE_MOB_LAYER diff --git a/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm b/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm index c6190a0d84a..c085f023c0b 100644 --- a/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm +++ b/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm @@ -338,7 +338,7 @@ name = "Space" icon = 'icons/effects/effects.dmi' icon_state = "blessed" - window_colour = "#000000" + window_colour = COLOR_BLACK material = /datum/material/glass replace_floors = list(/turf/open/floor/fakespace = 1) replace_walls = /turf/closed/wall/rock/porous diff --git a/code/game/objects/effects/decals/crayon.dm b/code/game/objects/effects/decals/crayon.dm index e4d07b62025..e42ee4d491f 100644 --- a/code/game/objects/effects/decals/crayon.dm +++ b/code/game/objects/effects/decals/crayon.dm @@ -9,7 +9,7 @@ flags_1 = ALLOW_DARK_PAINTS_1 var/do_icon_rotate = TRUE var/rotation = 0 - var/paint_colour = "#FFFFFF" + var/paint_colour = COLOR_WHITE /obj/effect/decal/cleanable/crayon/Initialize(mapload, main, type, e_name, graf_rot, alt_icon = null) . = ..() diff --git a/code/game/objects/effects/decals/turfdecal/markings.dm b/code/game/objects/effects/decals/turfdecal/markings.dm index f852cb04b5f..f7e46338e74 100644 --- a/code/game/objects/effects/decals/turfdecal/markings.dm +++ b/code/game/objects/effects/decals/turfdecal/markings.dm @@ -354,7 +354,7 @@ icon_state = "siding_thinplating_end" /obj/effect/turf_decal/siding/thinplating/light - color = "#FFFFFF" + color = COLOR_WHITE /obj/effect/turf_decal/siding/thinplating/light/corner icon_state = "siding_thinplating_corner" @@ -393,7 +393,7 @@ icon_state = "siding_wideplating_end" /obj/effect/turf_decal/siding/wideplating/light - color = "#FFFFFF" + color = COLOR_WHITE /obj/effect/turf_decal/siding/wideplating/light/corner icon_state = "siding_wideplating_corner" diff --git a/code/game/objects/effects/decals/turfdecal/tilecoloring.dm b/code/game/objects/effects/decals/turfdecal/tilecoloring.dm index f0035ad8aa8..6cafc9841a9 100644 --- a/code/game/objects/effects/decals/turfdecal/tilecoloring.dm +++ b/code/game/objects/effects/decals/turfdecal/tilecoloring.dm @@ -140,7 +140,7 @@ TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/dark) /// Date-specific tiles /obj/effect/turf_decal/tile/holiday name = "ERROR tile decal" - color = "#FF0000" + color = COLOR_RED /obj/effect/turf_decal/tile/holiday/Initialize(mapload) color = request_holiday_colors(src, pattern) @@ -257,7 +257,7 @@ TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/holiday/random) /// White trimlines /obj/effect/turf_decal/trimline/white - color = "#FFFFFF" + color = COLOR_WHITE TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/white) diff --git a/code/game/objects/effects/effect_system/fluid_spread/effects_smoke.dm b/code/game/objects/effects/effect_system/fluid_spread/effects_smoke.dm index fe35819caaf..a0bf078c3dc 100644 --- a/code/game/objects/effects/effect_system/fluid_spread/effects_smoke.dm +++ b/code/game/objects/effects/effect_system/fluid_spread/effects_smoke.dm @@ -235,7 +235,7 @@ /// Green smoke that makes you cough. /obj/effect/particle_effect/fluid/smoke/bad/green name = "green smoke" - color = "#00FF00" + color = COLOR_VIBRANT_LIME opacity = FALSE /// A factory which produces green smoke that makes you cough. diff --git a/code/game/objects/effects/spawners/costume.dm b/code/game/objects/effects/spawners/costume.dm index 68f189587b8..6eb3f801f73 100644 --- a/code/game/objects/effects/spawners/costume.dm +++ b/code/game/objects/effects/spawners/costume.dm @@ -2,7 +2,7 @@ name = "costume spawner" icon = 'icons/hud/screen_gen.dmi' icon_state = "x2" - color = "#00FF00" + color = COLOR_VIBRANT_LIME var/list/items diff --git a/code/game/objects/effects/wanted_poster.dm b/code/game/objects/effects/wanted_poster.dm index 6cb36838fbc..001f0119b9d 100644 --- a/code/game/objects/effects/wanted_poster.dm +++ b/code/game/objects/effects/wanted_poster.dm @@ -10,7 +10,7 @@ /obj/item/poster/wanted icon_state = "rolled_poster_legit" var/postHeaderText = "WANTED" // MAX 7 Characters - var/postHeaderColor = "#FF0000" + var/postHeaderColor = COLOR_RED var/background = "wanted_background" var/postName = "wanted poster" var/postDesc = "A wanted poster for" @@ -19,7 +19,7 @@ postName = "missing poster" postDesc = "A missing poster for" postHeaderText = "MISSING" // MAX 7 Characters - postHeaderColor = "#0000FF" + postHeaderColor = COLOR_BLUE /obj/item/poster/wanted/Initialize(mapload, icon/person_icon, wanted_name, description, headerText, posterHeaderColor) diff --git a/code/game/objects/items/AI_modules/_AI_modules.dm b/code/game/objects/items/AI_modules/_AI_modules.dm index 8d5375da1f0..55c1d09fe8d 100644 --- a/code/game/objects/items/AI_modules/_AI_modules.dm +++ b/code/game/objects/items/AI_modules/_AI_modules.dm @@ -166,7 +166,7 @@ name = "ai default lawset spawner" icon = 'icons/hud/screen_gen.dmi' icon_state = "x2" - color = "#00FF00" + color = COLOR_VIBRANT_LIME /obj/effect/spawner/round_default_module/Initialize(mapload) . = ..() diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index 8fe3cf877d5..00eedfaed8e 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -1736,7 +1736,7 @@ ///An icon state used as trim. var/scribbled_trim ///The colors for each of the above variables, for when overlays are updated. - var/details_colors = list("#000000", "#000000", "#000000") + var/details_colors = list(COLOR_BLACK, COLOR_BLACK, COLOR_BLACK) /obj/item/card/cardboard/equipped(mob/user, slot, initial = FALSE) . = ..() @@ -1782,14 +1782,14 @@ return scribbled_name = input_name var/list/details = item.get_writing_implement_details() - details_colors[INDEX_NAME_COLOR] = details["color"] || "#000000" + details_colors[INDEX_NAME_COLOR] = details["color"] || COLOR_BLACK if("Assignment") var/input_assignment = tgui_input_text(user, "What assignment would you like to put on this card?", "Cardboard card job ssignment", scribbled_assignment || "Assistant", MAX_NAME_LEN) if(!after_input_check(user, item, input_assignment, scribbled_assignment)) return scribbled_assignment = sanitize(input_assignment) var/list/details = item.get_writing_implement_details() - details_colors[INDEX_ASSIGNMENT_COLOR] = details["color"] || "#000000" + details_colors[INDEX_ASSIGNMENT_COLOR] = details["color"] || COLOR_BLACK if("Trim") var/static/list/possible_trims if(!possible_trims) @@ -1804,12 +1804,12 @@ return scribbled_trim = "cardboard_[input_trim]" var/list/details = item.get_writing_implement_details() - details_colors[INDEX_TRIM_COLOR] = details["color"] || "#000000" + details_colors[INDEX_TRIM_COLOR] = details["color"] || COLOR_BLACK if("Reset") scribbled_name = null scribbled_assignment = null scribbled_trim = null - details_colors = list("#000000", "#000000", "#000000") + details_colors = list(COLOR_BLACK, COLOR_BLACK, COLOR_BLACK) update_appearance() diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index beb79b318cd..d815e0dcf65 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -43,7 +43,7 @@ /// Crayon overlay to use if placed into a crayon box var/crayon_color = "red" /// Current paint colour - var/paint_color = "#FF0000" + var/paint_color = COLOR_RED /// Contains chosen symbol to draw var/drawtype @@ -809,7 +809,7 @@ if(pre_noise || post_noise) playsound(src, 'sound/effects/spray.ogg', 5, TRUE, 5) if(can_change_colour) - set_painting_tool_color("#C0C0C0") + set_painting_tool_color(COLOR_SILVER) update_appearance() if(actually_paints) H.update_lips("spray_face", paint_color) @@ -1013,7 +1013,7 @@ expose_turfs = TRUE charges = 100 reagent_contents = list(/datum/reagent/clf3 = 1) - paint_color = "#000000" + paint_color = COLOR_BLACK /obj/item/toy/crayon/spraycan/hellcan/isValidSurface(surface) return isfloorturf(surface) @@ -1042,7 +1042,7 @@ overlay_paint_colour = FALSE can_change_colour = FALSE - paint_color = "#FFFFFF" //RGB + paint_color = COLOR_WHITE //RGB pre_noise = FALSE post_noise = FALSE diff --git a/code/game/objects/items/credit_holochip.dm b/code/game/objects/items/credit_holochip.dm index 8e9fb78172f..83e6165b91d 100644 --- a/code/game/objects/items/credit_holochip.dm +++ b/code/game/objects/items/credit_holochip.dm @@ -67,7 +67,7 @@ if(20 to 49) overlay_color = "#358F34" if(50 to 99) - overlay_color = "#676767" + overlay_color = COLOR_SLIME_METAL if(100 to 199) overlay_color = "#009D9B" if(200 to 499) diff --git a/code/game/objects/items/devices/quantum_keycard.dm b/code/game/objects/items/devices/quantum_keycard.dm index c12c030c928..6c718cc9a43 100644 --- a/code/game/objects/items/devices/quantum_keycard.dm +++ b/code/game/objects/items/devices/quantum_keycard.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/devices/tool.dmi' icon_state = "quantum_keycard_gags" greyscale_config = /datum/greyscale_config/quantum_keycard - greyscale_colors = "#FFFFFF" + greyscale_colors = COLOR_WHITE inhand_icon_state = "card-id" lefthand_file = 'icons/mob/inhands/equipment/idcards_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/idcards_righthand.dmi' diff --git a/code/game/objects/items/devices/spyglasses.dm b/code/game/objects/items/devices/spyglasses.dm index 33754527c8f..8be7666bf96 100644 --- a/code/game/objects/items/devices/spyglasses.dm +++ b/code/game/objects/items/devices/spyglasses.dm @@ -87,7 +87,7 @@ /obj/item/paper/fluff/nerddocs name = "Espionage For Dummies" - color = "#FFFF00" + color = COLOR_YELLOW desc = "An eye gougingly yellow pamphlet with a badly designed image of a detective on it. the subtext says \" The Latest way to violate privacy guidelines!\" " default_raw_text = @{" diff --git a/code/game/objects/items/dna_probe.dm b/code/game/objects/items/dna_probe.dm index 6c9651a3142..5edbcc7bfc0 100644 --- a/code/game/objects/items/dna_probe.dm +++ b/code/game/objects/items/dna_probe.dm @@ -136,7 +136,7 @@ if(!do_after(user, CARP_MIX_DNA_TIMER)) return var/mob/living/basic/space_dragon/new_dragon = user.change_mob_type(/mob/living/basic/space_dragon, location = loc, delete_old_mob = TRUE) - new_dragon.add_filter("anger_glow", 3, list("type" = "outline", "color" = "#ff330030", "size" = 5)) + new_dragon.add_filter("anger_glow", 3, list("type" = "outline", "color" = COLOR_CARP_RIFT_RED, "size" = 5)) new_dragon.add_movespeed_modifier(/datum/movespeed_modifier/dragon_rage) priority_announce("A large organic energy flux has been recorded near of [station_name()], please stand-by.", "Lifesign Alert") qdel(src) diff --git a/code/game/objects/items/food/meatslab.dm b/code/game/objects/items/food/meatslab.dm index c1b5a6a186f..7816fb0e83a 100644 --- a/code/game/objects/items/food/meatslab.dm +++ b/code/game/objects/items/food/meatslab.dm @@ -39,7 +39,7 @@ tastes = list("meat" = 1) foodtypes = MEAT | RAW ///Legacy code, handles the coloring of the overlay of the cutlets made from this. - var/slab_color = "#FF0000" + var/slab_color = COLOR_RED /obj/item/food/meat/slab/Initialize(mapload) diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 73fd7dcec33..da893069d6f 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -470,7 +470,7 @@ greyscale_config_inhand_left = /datum/greyscale_config/cleric_mace_lefthand greyscale_config_inhand_right = /datum/greyscale_config/cleric_mace_righthand greyscale_config_worn = /datum/greyscale_config/cleric_mace - greyscale_colors = "#FFFFFF" + greyscale_colors = COLOR_WHITE material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_GREYSCALE | MATERIAL_AFFECT_STATISTICS //Material type changes the prefix as well as the color. custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*6) //Defaults to an Iron Mace. diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index e2d1b6f26e9..1d5c37ffc22 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -524,7 +524,7 @@ generated_lizard_color = "#66ff33" // Set our greyscale colors to the lizard color we made + black eyes - set_greyscale(colors = list(generated_lizard_color, "#000000")) + set_greyscale(colors = list(generated_lizard_color, COLOR_BLACK)) // Preset lizard plushie that uses the original lizard plush green. (Or close to it) /obj/item/toy/plush/lizard_plushie/green diff --git a/code/game/objects/items/stacks/wrap.dm b/code/game/objects/items/stacks/wrap.dm index cfff5ab14e7..e4b29b005a3 100644 --- a/code/game/objects/items/stacks/wrap.dm +++ b/code/game/objects/items/stacks/wrap.dm @@ -29,9 +29,9 @@ //If colors are too dark, set to original colors if(base_hsv[3] < 50) - generated_base_color = "#00FF00" + generated_base_color = COLOR_VIBRANT_LIME if(ribbon_hsv[3] < 50) - generated_ribbon_color = "#FF0000" + generated_ribbon_color = COLOR_RED //Set layers to these colors, base then ribbon set_greyscale(colors = list(generated_base_color, generated_ribbon_color)) diff --git a/code/game/objects/structures/cannons/cannonballs.dm b/code/game/objects/structures/cannons/cannonballs.dm index 08533bdcebd..855292e8521 100644 --- a/code/game/objects/structures/cannons/cannonballs.dm +++ b/code/game/objects/structures/cannons/cannonballs.dm @@ -29,7 +29,7 @@ name = "explosive shellballs" singular_name = "explosive shellball" desc = "An explosive anti-materiel and counter-battery projectile cannonball. Makes great work out of any wall, for easy entrances." - color = "#FF0000" + color = COLOR_RED merge_type = /obj/item/stack/cannonball/shellball projectile_type = /obj/projectile/bullet/cannonball/explosive diff --git a/code/game/objects/structures/fans.dm b/code/game/objects/structures/fans.dm index ef34a07b5b6..924da72ee30 100644 --- a/code/game/objects/structures/fans.dm +++ b/code/game/objects/structures/fans.dm @@ -54,6 +54,6 @@ desc = "An tenuously thin energy shield only capable of holding in air, but not solid objects or people." icon = 'icons/effects/effects.dmi' icon_state = "shield-old" // We should probably get these their own icon at some point - light_color = "#6496FA" + light_color = LIGHT_COLOR_BLUE light_range = 4 diff --git a/code/game/objects/structures/mystery_box.dm b/code/game/objects/structures/mystery_box.dm index 63092cfeac3..1843ef99761 100644 --- a/code/game/objects/structures/mystery_box.dm +++ b/code/game/objects/structures/mystery_box.dm @@ -272,7 +272,7 @@ GLOBAL_LIST_INIT(mystery_box_extended, list( /obj/mystery_box_item/proc/present_item() var/obj/item/selected_item = selected_path - add_filter("ready_outline", 2, list("type" = "outline", "color" = "#FBFF23", "size" = 0.2)) + add_filter("ready_outline", 2, list("type" = "outline", "color" = COLOR_VIVID_YELLOW, "size" = 0.2)) name = initial(selected_item.name) parent_box.present_weapon() claimable = TRUE diff --git a/code/modules/admin/verbs/secrets.dm b/code/modules/admin/verbs/secrets.dm index fa2a9fa19c6..e70138ad8ac 100644 --- a/code/modules/admin/verbs/secrets.dm +++ b/code/modules/admin/verbs/secrets.dm @@ -377,7 +377,7 @@ GLOBAL_DATUM(everyone_an_antag, /datum/everyone_is_an_antag_controller) "playersonly" = list("desc" = "Only spawn ghost-controlled mobs", "type" = "boolean", "value" = "No"), "ghostpoll" = list("desc" = "Ghost poll question", "type" = "string", "value" = "Do you want to play as %TYPE% portal invader?"), "delay" = list("desc" = "Time between portals, in deciseconds", "type" = "number", "value" = 50), - "color" = list("desc" = "Portal color", "type" = "color", "value" = "#00FF00"), + "color" = list("desc" = "Portal color", "type" = "color", "value" = COLOR_VIBRANT_LIME), "playlightning" = list("desc" = "Play lightning sounds on announcement", "type" = "boolean", "value" = "Yes"), "announce_players" = list("desc" = "Make an announcement", "type" = "boolean", "value" = "Yes"), "announcement" = list("desc" = "Announcement", "type" = "string", "value" = "Massive bluespace anomaly detected en route to %STATION%. Brace for impact."), diff --git a/code/modules/antagonists/blob/blobstrains/_reagent.dm b/code/modules/antagonists/blob/blobstrains/_reagent.dm index 9d95d1be8eb..2d7f4c5d34e 100644 --- a/code/modules/antagonists/blob/blobstrains/_reagent.dm +++ b/code/modules/antagonists/blob/blobstrains/_reagent.dm @@ -27,7 +27,7 @@ /datum/reagent/blob name = "Unknown" description = "shouldn't exist and you should adminhelp immediately." - color = "#FFFFFF" + color = COLOR_WHITE taste_description = "bad code and slime" chemical_flags = NONE penetrates_skin = NONE diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm index 04aa7114abd..4afd38739fc 100644 --- a/code/modules/antagonists/cult/blood_magic.dm +++ b/code/modules/antagonists/cult/blood_magic.dm @@ -494,7 +494,7 @@ name = "Shackling Aura" desc = "Will start handcuffing a victim on contact, and mute them if successful." invocation = "In'totum Lig'abis!" - color = "#000000" // black + color = COLOR_BLACK // black /obj/item/melee/blood_magic/shackles/afterattack(atom/target, mob/living/carbon/user, proximity) if(IS_CULTIST(user) && iscarbon(target) && proximity) @@ -544,7 +544,7 @@ name = "Twisting Aura" desc = "Corrupts certain metalic objects on contact." invocation = "Ethra p'ni dedol!" - color = "#000000" // black + color = COLOR_BLACK // black var/channeling = FALSE /obj/item/melee/blood_magic/construction/examine(mob/user) diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm index e38c762d700..d9418bb1010 100644 --- a/code/modules/antagonists/cult/cult.dm +++ b/code/modules/antagonists/cult/cult.dm @@ -42,13 +42,13 @@ var/datum/action/innate/cult/blood_magic/magic = new(owner) magic.Grant(current) - current.log_message("has been converted to the cult of Nar'Sie!", LOG_ATTACK, color="#960000") + current.log_message("has been converted to the cult of Nar'Sie!", LOG_ATTACK, color=COLOR_CULT_RED) /datum/antagonist/cult/on_removal() if(!silent) owner.current.visible_message(span_deconversion_message("[owner.current] looks like [owner.current.p_theyve()] just reverted to [owner.current.p_their()] old faith!"), ignored_mobs = owner.current) to_chat(owner.current, span_userdanger("An unfamiliar white light flashes through your mind, cleansing the taint of the Geometer and all your memories as her servant.")) - owner.current.log_message("has renounced the cult of Nar'Sie!", LOG_ATTACK, color="#960000") + owner.current.log_message("has renounced the cult of Nar'Sie!", LOG_ATTACK, color=COLOR_CULT_RED) if(vote_ability) QDEL_NULL(vote_ability) diff --git a/code/modules/antagonists/fugitive/fugitive_outfits.dm b/code/modules/antagonists/fugitive/fugitive_outfits.dm index 3efab657101..ed256acae03 100644 --- a/code/modules/antagonists/fugitive/fugitive_outfits.dm +++ b/code/modules/antagonists/fugitive/fugitive_outfits.dm @@ -36,14 +36,14 @@ if(visualsOnly) return equipped_on.fully_replace_character_name(null, "Waldo") - equipped_on.eye_color_left = "#000000" - equipped_on.eye_color_right = "#000000" + equipped_on.eye_color_left = COLOR_BLACK + equipped_on.eye_color_right = COLOR_BLACK equipped_on.gender = MALE equipped_on.skin_tone = "caucasian3" equipped_on.hairstyle = "Business Hair 3" equipped_on.facial_hairstyle = "Shaved" - equipped_on.hair_color = "#000000" - equipped_on.facial_hair_color = "#000000" + equipped_on.hair_color = COLOR_BLACK + equipped_on.facial_hair_color = COLOR_BLACK equipped_on.update_body(is_creating = TRUE) var/list/no_drops = list() diff --git a/code/modules/antagonists/nightmare/nightmare_equipment.dm b/code/modules/antagonists/nightmare/nightmare_equipment.dm index fd80b3ea3ef..ec07639cb44 100644 --- a/code/modules/antagonists/nightmare/nightmare_equipment.dm +++ b/code/modules/antagonists/nightmare/nightmare_equipment.dm @@ -73,7 +73,7 @@ if(has_crit) return has_crit = TRUE - add_filter("crit_glow", 3, list("type" = "outline", "color" = "#ff330030", "size" = 5)) + add_filter("crit_glow", 3, list("type" = "outline", "color" = COLOR_CARP_RIFT_RED, "size" = 5)) if(ismob(loc)) loc.balloon_alert(loc, "critical strike ready") diff --git a/code/modules/antagonists/nightmare/nightmare_organs.dm b/code/modules/antagonists/nightmare/nightmare_organs.dm index c06f1e322a2..576b911652f 100644 --- a/code/modules/antagonists/nightmare/nightmare_organs.dm +++ b/code/modules/antagonists/nightmare/nightmare_organs.dm @@ -68,7 +68,7 @@ icon_state = "demon_heart-on" base_icon_state = "demon_heart" visual = TRUE - color = "#1C1C1C" + color = COLOR_CRAYON_BLACK decay_factor = 0 /// How many life ticks in the dark the owner has been dead for. Used for nightmare respawns. var/respawn_progress = 0 diff --git a/code/modules/antagonists/nukeop/equipment/nuclear_authentication_disk.dm b/code/modules/antagonists/nukeop/equipment/nuclear_authentication_disk.dm index c318679b4f6..7e06dd0d6e0 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclear_authentication_disk.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclear_authentication_disk.dm @@ -104,7 +104,7 @@ user.visible_message(span_suicide("[user] is going delta! It looks like [user.p_theyre()] trying to commit suicide!")) playsound(src, 'sound/machines/alarm.ogg', 50, -1, TRUE) for(var/i in 1 to 100) - addtimer(CALLBACK(user, TYPE_PROC_REF(/atom, add_atom_colour), (i % 2)? "#00FF00" : "#FF0000", ADMIN_COLOUR_PRIORITY), i) + addtimer(CALLBACK(user, TYPE_PROC_REF(/atom, add_atom_colour), (i % 2)? COLOR_VIBRANT_LIME : COLOR_RED, ADMIN_COLOUR_PRIORITY), i) addtimer(CALLBACK(src, PROC_REF(manual_suicide), user), 101) return MANUAL_SUICIDE diff --git a/code/modules/antagonists/revolution/revolution.dm b/code/modules/antagonists/revolution/revolution.dm index 708f94c3fc3..e34907d64ae 100644 --- a/code/modules/antagonists/revolution/revolution.dm +++ b/code/modules/antagonists/revolution/revolution.dm @@ -334,7 +334,7 @@ /// Handles rev removal via IC methods such as borging, mindshielding, blunt force trauma to the head or revs losing. /datum/antagonist/rev/proc/remove_revolutionary(deconverter) - owner.current.log_message("has been deconverted from the revolution by [ismob(deconverter) ? key_name(deconverter) : deconverter]!", LOG_ATTACK, color="#960000") + owner.current.log_message("has been deconverted from the revolution by [ismob(deconverter) ? key_name(deconverter) : deconverter]!", LOG_ATTACK, color=COLOR_CULT_RED) if(deconverter == DECONVERTER_BORGED) message_admins("[ADMIN_LOOKUPFLW(owner.current)] has been borged while being a [name]") owner.special_role = null diff --git a/code/modules/antagonists/space_dragon/space_dragon.dm b/code/modules/antagonists/space_dragon/space_dragon.dm index 25543fbc8fe..17650faf937 100644 --- a/code/modules/antagonists/space_dragon/space_dragon.dm +++ b/code/modules/antagonists/space_dragon/space_dragon.dm @@ -196,7 +196,7 @@ */ /datum/antagonist/space_dragon/proc/permanant_empower() owner.current.fully_heal() - owner.current.add_filter("anger_glow", 3, list("type" = "outline", "color" = "#ff330030", "size" = 5)) + owner.current.add_filter("anger_glow", 3, list("type" = "outline", "color" = COLOR_CARP_RIFT_RED, "size" = 5)) owner.current.add_movespeed_modifier(/datum/movespeed_modifier/dragon_rage) /** @@ -207,7 +207,7 @@ */ /datum/antagonist/space_dragon/proc/rift_empower() owner.current.fully_heal() - owner.current.add_filter("anger_glow", 3, list("type" = "outline", "color" = "#ff330030", "size" = 5)) + owner.current.add_filter("anger_glow", 3, list("type" = "outline", "color" = COLOR_CARP_RIFT_RED, "size" = 5)) owner.current.add_movespeed_modifier(/datum/movespeed_modifier/dragon_rage) addtimer(CALLBACK(src, PROC_REF(rift_depower)), 30 SECONDS) diff --git a/code/modules/art/paintings.dm b/code/modules/art/paintings.dm index 479b4c671cc..2e7d8cc51c9 100644 --- a/code/modules/art/paintings.dm +++ b/code/modules/art/paintings.dm @@ -830,7 +830,7 @@ righthand_file = 'icons/mob/inhands/equipment/palette_righthand.dmi' w_class = WEIGHT_CLASS_TINY ///Chosen paint color - var/current_color = "#000000" + var/current_color = COLOR_BLACK /obj/item/paint_palette/Initialize(mapload) . = ..() diff --git a/code/modules/asset_cache/assets/vending.dm b/code/modules/asset_cache/assets/vending.dm index e7d2fb9bc37..4d99eeefdc9 100644 --- a/code/modules/asset_cache/assets/vending.dm +++ b/code/modules/asset_cache/assets/vending.dm @@ -38,7 +38,7 @@ var/icon/I = icon(icon_file, icon_state, SOUTH) var/c = initial(item.color) - if (!isnull(c) && c != "#FFFFFF") + if (!isnull(c) && c != COLOR_WHITE) I.Blend(c, ICON_MULTIPLY) var/imgid = replacetext(replacetext("[item]", "/obj/item/", ""), "/", "-") diff --git a/code/modules/atmospherics/gasmixtures/gas_types.dm b/code/modules/atmospherics/gasmixtures/gas_types.dm index 060b5a12ae9..32acadb3bee 100644 --- a/code/modules/atmospherics/gasmixtures/gas_types.dm +++ b/code/modules/atmospherics/gasmixtures/gas_types.dm @@ -97,7 +97,7 @@ purchaseable = TRUE base_value = 0.2 desc = "What the fuck is carbon dioxide?" - primary_color = "#808080" + primary_color = COLOR_GRAY /datum/gas/plasma id = GAS_PLASMA @@ -134,7 +134,7 @@ rarity = 50 base_value = 2.5 desc = "The most noble gas of them all. High quantities of hyper-noblium actively prevents reactions from occuring." - primary_color = "#008080" + primary_color = COLOR_TEAL /datum/gas/nitrous_oxide id = GAS_N2O @@ -208,7 +208,7 @@ rarity = 250 base_value = 1 desc = "Not necessarily a gas, miasma refers to biological pollutants found in the atmosphere." - primary_color = "#808000" + primary_color = COLOR_OLIVE /datum/gas/freon id = GAS_FREON @@ -280,7 +280,7 @@ rarity = 300 base_value = 4 desc = "A potent fire supressant. Removes oxygen from high temperature fires and cools down the area" - primary_color = "#800080" + primary_color = COLOR_PURPLE /datum/gas/helium id = GAS_HELIUM @@ -303,7 +303,7 @@ rarity = 1 base_value = 10 desc = "We still don't know what it does, but it sells for a lot." - primary_color = "#800000" + primary_color = COLOR_MAROON /obj/effect/overlay/gas icon = 'icons/effects/atmospherics.dmi' diff --git a/code/modules/atmospherics/machinery/datum_pipeline.dm b/code/modules/atmospherics/machinery/datum_pipeline.dm index 6153420358c..edccd808bec 100644 --- a/code/modules/atmospherics/machinery/datum_pipeline.dm +++ b/code/modules/atmospherics/machinery/datum_pipeline.dm @@ -356,12 +356,12 @@ current_color = BlendHSV(current_color, gas_color, gas_weight / current_weight) if(!current_color) - current_color = "#000000" + current_color = COLOR_BLACK else // Empty weight is prety much arbitrary, just tuned to make the color change from black reasonably quickly without hitting max color immediately var/empty_weight = (air.volume * 1.5 - current_weight) / 10 if(empty_weight > 0) - current_color = BlendHSV("#000000", current_color, current_weight / (empty_weight + current_weight)) + current_color = BlendHSV(COLOR_BLACK, current_color, current_weight / (empty_weight + current_weight)) if(gasmix_color != current_color) gasmix_color = current_color diff --git a/code/modules/atmospherics/machinery/other/miner.dm b/code/modules/atmospherics/machinery/other/miner.dm index dd1024d8d3e..823ce906617 100644 --- a/code/modules/atmospherics/machinery/other/miner.dm +++ b/code/modules/atmospherics/machinery/other/miner.dm @@ -18,7 +18,7 @@ var/spawn_mol = MOLES_CELLSTANDARD * 5 var/max_ext_mol = INFINITY var/max_ext_kpa = 6500 - var/overlay_color = "#FFFFFF" + var/overlay_color = COLOR_WHITE var/active = TRUE var/power_draw = 0 var/power_draw_static = 2000 @@ -161,7 +161,7 @@ /obj/machinery/atmospherics/miner/plasma name = "\improper Plasma Gas Miner" - overlay_color = "#FF0000" + overlay_color = COLOR_RED spawn_id = /datum/gas/plasma /obj/machinery/atmospherics/miner/carbon_dioxide diff --git a/code/modules/bitrunning/util/service_style.dm b/code/modules/bitrunning/util/service_style.dm index f420e783064..f472390c8ac 100644 --- a/code/modules/bitrunning/util/service_style.dm +++ b/code/modules/bitrunning/util/service_style.dm @@ -2,7 +2,7 @@ /mob/living/carbon/human/proc/set_service_style() var/static/list/approved_hair_colors = list( "#4B3D28", - "#000000", + COLOR_BLACK, "#8D4A43", "#D2B48C", ) diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm index 8d36d624944..259be3891dd 100644 --- a/code/modules/cargo/supplypod.dm +++ b/code/modules/cargo/supplypod.dm @@ -200,7 +200,7 @@ var/icon/door_masker = new(icon, door) //The door shape we want to 'cut out' of the decal door_masker.MapColors(0,0,0,1, 0,0,0,1, 0,0,0,1, 1,1,1,0, 0,0,0,1) door_masker.SwapColor("#ffffffff", null) - door_masker.Blend("#000000", ICON_SUBTRACT) + door_masker.Blend(COLOR_BLACK, ICON_SUBTRACT) masked_decal.Blend(door_masker, ICON_ADD) . += masked_decal return @@ -217,7 +217,7 @@ var/icon/fin_masker = new(icon, "mask_[fin_mask]") //The fin shape we want to 'cut out' of the door fin_masker.MapColors(0,0,0,1, 0,0,0,1, 0,0,0,1, 1,1,1,0, 0,0,0,1) fin_masker.SwapColor("#ffffffff", null) - fin_masker.Blend("#000000", ICON_SUBTRACT) + fin_masker.Blend(COLOR_BLACK, ICON_SUBTRACT) masked_door.Blend(fin_masker, ICON_ADD) . += masked_door if(decal) diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index c6a27a03871..f20b6f32eab 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -545,7 +545,7 @@ /obj/item/clothing/head/beret/medical name = "medical beret" desc = "A medical-flavored beret for the doctor in you!" - greyscale_colors = "#FFFFFF" + greyscale_colors = COLOR_WHITE flags_1 = NONE /obj/item/clothing/head/beret/medical/paramedic diff --git a/code/modules/clothing/head/wig.dm b/code/modules/clothing/head/wig.dm index 565d04e3b63..2300692a038 100644 --- a/code/modules/clothing/head/wig.dm +++ b/code/modules/clothing/head/wig.dm @@ -7,7 +7,7 @@ inhand_icon_state = "pwig" worn_icon_state = "wig" flags_inv = HIDEHAIR - color = "#000000" + color = COLOR_BLACK var/hairstyle = "Very Long Hair" var/adjustablecolor = TRUE //can color be changed manually? @@ -112,7 +112,7 @@ /obj/item/clothing/head/wig/natural name = "natural wig" desc = "A bunch of hair without a head attached. This one changes color to match the hair of the wearer. Nothing natural about that." - color = "#FFFFFF" + color = COLOR_WHITE adjustablecolor = FALSE custom_price = PAYCHECK_COMMAND diff --git a/code/modules/clothing/masks/costume.dm b/code/modules/clothing/masks/costume.dm index 384b6a43460..893455dcdd0 100644 --- a/code/modules/clothing/masks/costume.dm +++ b/code/modules/clothing/masks/costume.dm @@ -61,7 +61,7 @@ w_class = WEIGHT_CLASS_SMALL flags_inv = HIDEFACE|HIDEFACIALHAIR|HIDESNOUT custom_price = PAYCHECK_CREW - greyscale_colors = "#EEEEEE" + greyscale_colors = COLOR_VERY_LIGHT_GRAY greyscale_config = /datum/greyscale_config/rebellion_mask greyscale_config_worn = /datum/greyscale_config/rebellion_mask/worn flags_1 = IS_PLAYER_COLORABLE_1 diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm index 93f6e8d15fc..51a0a795fc0 100644 --- a/code/modules/clothing/neck/_neck.dm +++ b/code/modules/clothing/neck/_neck.dm @@ -409,7 +409,7 @@ icon_state = "infinity_scarf" w_class = WEIGHT_CLASS_TINY custom_price = PAYCHECK_CREW - greyscale_colors = "#EEEEEE" + greyscale_colors = COLOR_VERY_LIGHT_GRAY greyscale_config = /datum/greyscale_config/infinity_scarf greyscale_config_worn = /datum/greyscale_config/infinity_scarf/worn flags_1 = IS_PLAYER_COLORABLE_1 diff --git a/code/modules/clothing/neck/collar_bomb.dm b/code/modules/clothing/neck/collar_bomb.dm index 72f5b20320d..7a5314f4c18 100644 --- a/code/modules/clothing/neck/collar_bomb.dm +++ b/code/modules/clothing/neck/collar_bomb.dm @@ -78,7 +78,7 @@ var/obj/item/bodypart/head/myhead = brian.get_bodypart(BODY_ZONE_HEAD) myhead?.dismember() brian.investigate_log("has been decapitated by [src].", INVESTIGATE_DEATHS) - flash_color(brian, flash_color = "#FF0000", flash_time = 1 SECONDS) + flash_color(brian, flash_color = COLOR_RED, flash_time = 1 SECONDS) qdel(src) ///The button that detonates the collar. diff --git a/code/modules/clothing/outfits/event.dm b/code/modules/clothing/outfits/event.dm index fc94adb9ff5..fa07b3297b2 100644 --- a/code/modules/clothing/outfits/event.dm +++ b/code/modules/clothing/outfits/event.dm @@ -23,6 +23,6 @@ user.hairstyle = "Long Hair 3" user.facial_hairstyle = "Beard (Full)" - user.hair_color = "#FFFFFF" - user.facial_hair_color = "#FFFFFF" + user.hair_color = COLOR_WHITE + user.facial_hair_color = COLOR_WHITE user.update_body_parts(update_limb_data = TRUE) diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index 860ac12d202..5bdec24b967 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -59,7 +59,7 @@ light_on = FALSE var/helmet_on = FALSE var/smile = FALSE - var/smile_color = "#FF0000" + var/smile_color = COLOR_RED var/visor_icon = "envisor" var/smile_state = "envirohelm_smile" var/obj/item/clothing/head/attached_hat diff --git a/code/modules/clothing/suits/shirt.dm b/code/modules/clothing/suits/shirt.dm index 3d5c8fb4462..9b8ce90693b 100644 --- a/code/modules/clothing/suits/shirt.dm +++ b/code/modules/clothing/suits/shirt.dm @@ -5,7 +5,7 @@ inhand_icon_state = null greyscale_config = /datum/greyscale_config/wellworn_shirt greyscale_config_worn = /datum/greyscale_config/wellworn_shirt/worn - greyscale_colors = "#FFFFFF" + greyscale_colors = COLOR_WHITE species_exception = list(/datum/species/golem) flags_1 = IS_PLAYER_COLORABLE_1 ///How many times has this shirt been washed? (In an ideal world this is just the determinant of the transform matrix.) diff --git a/code/modules/events/aurora_caelus.dm b/code/modules/events/aurora_caelus.dm index 34681825502..0acb0ad9781 100644 --- a/code/modules/events/aurora_caelus.dm +++ b/code/modules/events/aurora_caelus.dm @@ -92,14 +92,14 @@ var/start_color = hsl_gradient(1, 0, "#A2FF80", 1, "#A2FFEE") var/start_range = 1 var/start_power = 0.75 - var/end_color = "#000000" + var/end_color = COLOR_BLACK var/end_range = 0.5 var/end_power = 0 if(fade_in) end_color = hsl_gradient(0, 0, "#A2FF80", 1, "#A2FFEE") end_range = start_range end_power = start_power - start_color = "#000000" + start_color = COLOR_BLACK start_range = 0.5 start_power = 0 diff --git a/code/modules/events/portal_storm.dm b/code/modules/events/portal_storm.dm index 8ad0b48985f..0ca7800ee22 100644 --- a/code/modules/events/portal_storm.dm +++ b/code/modules/events/portal_storm.dm @@ -51,7 +51,7 @@ for(var/offset in 0 to SSmapping.max_plane_offset) var/mutable_appearance/storm = mutable_appearance('icons/obj/machines/engine/energy_ball.dmi', "energy_ball_fast", FLY_LAYER) SET_PLANE_W_SCALAR(storm, ABOVE_GAME_PLANE, offset) - storm.color = "#00FF00" + storm.color = COLOR_VIBRANT_LIME storm_appearances += storm number_of_bosses = 0 diff --git a/code/modules/experisci/handheld_scanner.dm b/code/modules/experisci/handheld_scanner.dm index d09b6bca7e3..32309336e3c 100644 --- a/code/modules/experisci/handheld_scanner.dm +++ b/code/modules/experisci/handheld_scanner.dm @@ -36,7 +36,7 @@ user.forceMove(src) user.AddComponent(/datum/component/itembound, src) //basically a bread smite but with a bloody finale icon_state = "experiscanner_closed" - add_atom_colour("#FF0000", ADMIN_COLOUR_PRIORITY) + add_atom_colour(COLOR_RED, ADMIN_COLOUR_PRIORITY) playsound(src, 'sound/effects/pope_entry.ogg', 60, TRUE) playsound(src, 'sound/machines/destructive_scanner/ScanDangerous.ogg', 40) @@ -57,7 +57,7 @@ result_toilet.buildstacktype = /obj/effect/decal/remains/human //this also prevents the toilet from dropping meat sheets. if you want to cheese the meat exepriments, sacrifice more people icon_state = "experiscanner" - remove_atom_colour(ADMIN_COLOUR_PRIORITY, "#FF0000") + remove_atom_colour(ADMIN_COLOUR_PRIORITY, COLOR_RED) user.gib(DROP_BRAIN) //we delete everything but the brain, as it's going to be moved to the cistern toilet_brain.forceMove(result_toilet) diff --git a/code/modules/fishing/fishing_equipment.dm b/code/modules/fishing/fishing_equipment.dm index 4b30951d89a..df6c4eee9c2 100644 --- a/code/modules/fishing/fishing_equipment.dm +++ b/code/modules/fishing/fishing_equipment.dm @@ -15,7 +15,7 @@ ///A list of traits that this fishing line has, checked by fish traits and the minigame. var/list/fishing_line_traits /// Color of the fishing line - var/line_color = "#808080" + var/line_color = COLOR_GRAY /obj/item/fishing_line/reinforced name = "reinforced fishing line reel" diff --git a/code/modules/food_and_drinks/recipes/soup_mixtures.dm b/code/modules/food_and_drinks/recipes/soup_mixtures.dm index d7f391bdc15..5caf7268b1a 100644 --- a/code/modules/food_and_drinks/recipes/soup_mixtures.dm +++ b/code/modules/food_and_drinks/recipes/soup_mixtures.dm @@ -564,7 +564,7 @@ "someone's parents" = 2, ) glass_price = FOOD_PRICE_EXOTIC - color = "#FF0000" + color = COLOR_RED /datum/glass_style/has_foodtype/soup/clownchili required_drink_type = /datum/reagent/consumable/nutriment/soup/clownchili @@ -618,7 +618,7 @@ name = "Tomato Soup" description = "Drinking this feels like being a vampire! A tomato vampire..." data = list("tomato" = 1) - color = "#FF0000" + color = COLOR_RED /datum/glass_style/has_foodtype/soup/tomato required_drink_type = /datum/reagent/consumable/nutriment/soup/tomato @@ -1325,7 +1325,7 @@ name = "Corn Chowder" description = "A creamy bowl of corn chowder, with bacon bits and mixed vegetables. One bowl is never enough." data = list("creamy broth" = 1, "bacon" = 1, "mixed vegetables" = 1) - color = "#FFF200" + color = COLOR_CRAYON_YELLOW /datum/glass_style/has_foodtype/soup/corn_chowder required_drink_type = /datum/reagent/consumable/nutriment/soup/corn_chowder diff --git a/code/modules/hallucination/stray_bullet.dm b/code/modules/hallucination/stray_bullet.dm index 9281bc65343..63e19c1bb89 100644 --- a/code/modules/hallucination/stray_bullet.dm +++ b/code/modules/hallucination/stray_bullet.dm @@ -224,7 +224,7 @@ name = "electrode" damage_type = BURN hal_icon_state = "spark" - color = "#FFFF00" + color = COLOR_YELLOW hal_fire_sound = 'sound/weapons/taser.ogg' hal_hitsound = 'sound/weapons/taserhit.ogg' hal_hitsound_wall = null diff --git a/code/modules/hydroponics/grown/rainbow_bunch.dm b/code/modules/hydroponics/grown/rainbow_bunch.dm index cfe7dfbf567..4ffad4583c7 100644 --- a/code/modules/hydroponics/grown/rainbow_bunch.dm +++ b/code/modules/hydroponics/grown/rainbow_bunch.dm @@ -33,7 +33,7 @@ throw_range = 3 attack_verb_continuous = list("pompfs") attack_verb_simple = list("pompf") - greyscale_colors = "#000000" //only here for unit testing. overriden in initialize() + greyscale_colors = COLOR_BLACK //only here for unit testing. overriden in initialize() greyscale_config = /datum/greyscale_config/flower_simple greyscale_config_worn = /datum/greyscale_config/flower_simple_worn @@ -80,7 +80,7 @@ dye_color = DYE_BLACK desc += " This one is in a midnight black color." if(8) - set_greyscale("#FFFFFF") + set_greyscale(COLOR_WHITE) reagents.add_reagent(/datum/reagent/colorful_reagent/powder/white, 3) dye_color = DYE_WHITE desc += " This one is in a pure white color." diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 60d87e02a33..fc70946fa56 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -159,7 +159,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) /mob/dead/observer/narsie_act() var/old_color = color - color = "#960000" + color = COLOR_CULT_RED animate(src, color = old_color, time = 10, flags = ANIMATION_PARALLEL) addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_atom_colour)), 10) diff --git a/code/modules/mob/living/basic/bots/_bots.dm b/code/modules/mob/living/basic/bots/_bots.dm index d1c306313d7..5aae11b5856 100644 --- a/code/modules/mob/living/basic/bots/_bots.dm +++ b/code/modules/mob/living/basic/bots/_bots.dm @@ -72,7 +72,7 @@ GLOBAL_LIST_INIT(command_strings, list( ///state of the path icon var/path_image_icon_state = "path_indicator" ///what color this path icon will use - var/path_image_color = "#FFFFFF" + var/path_image_color = COLOR_WHITE ///list of all layed path icons var/list/current_pathed_turfs = list() diff --git a/code/modules/mob/living/basic/guardian/guardian_types/charger.dm b/code/modules/mob/living/basic/guardian/guardian_types/charger.dm index 07c5e31f144..10ef9c34d53 100644 --- a/code/modules/mob/living/basic/guardian/guardian_types/charger.dm +++ b/code/modules/mob/living/basic/guardian/guardian_types/charger.dm @@ -46,7 +46,7 @@ /datum/action/cooldown/mob_cooldown/charge/basic_charge/guardian/do_charge_indicator(atom/charger, atom/charge_target) playsound(charger, 'sound/items/modsuit/loader_launch.ogg', 75, TRUE) var/obj/effect/temp_visual/decoy/decoy_flash = new /obj/effect/temp_visual/decoy(charger.loc, charger) - animate(decoy_flash, alpha = 0, color = "#FF0000", transform = matrix() * 2, time = 3) + animate(decoy_flash, alpha = 0, color = COLOR_RED, transform = matrix() * 2, time = 3) /datum/action/cooldown/mob_cooldown/charge/basic_charge/guardian/can_hit_target(atom/movable/source, atom/target) var/mob/living/living_target = target diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 659d110978d..2af18c0df46 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -647,7 +647,7 @@ // If we have a species, we need to handle mutant parts and stuff if(dna?.species) - add_atom_colour("#000000", TEMPORARY_COLOUR_PRIORITY) + add_atom_colour(COLOR_BLACK, TEMPORARY_COLOUR_PRIORITY) var/static/mutable_appearance/shock_animation_dna if(!shock_animation_dna) shock_animation_dna = mutable_appearance(icon, "electrocuted_base") @@ -666,7 +666,7 @@ addtimer(CALLBACK(src, PROC_REF(end_electrocution_animation), zap_appearance), anim_duration) /mob/living/carbon/human/proc/end_electrocution_animation(mutable_appearance/MA) - remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, "#000000") + remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, COLOR_BLACK) cut_overlay(MA) /mob/living/carbon/human/resist_restraints() diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index c9d6df04d4d..9dc4b37882d 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -19,7 +19,7 @@ health = HUMAN_MAXHEALTH //NOVA EDIT ADDITION //Hair colour and style - var/hair_color = "#000000" + var/hair_color = COLOR_BLACK var/hairstyle = "Bald" ///Colours used for hair and facial hair gradients. @@ -28,12 +28,12 @@ var/list/grad_style //Facial hair colour and style - var/facial_hair_color = "#000000" + var/facial_hair_color = COLOR_BLACK var/facial_hairstyle = "Shaved" //Eye colour - var/eye_color_left = "#000000" - var/eye_color_right = "#000000" + var/eye_color_left = COLOR_BLACK + var/eye_color_right = COLOR_BLACK /// Var used to keep track of a human mob having a heterochromatic right eye. To ensure prefs don't overwrite shit var/eye_color_heterochromatic = FALSE @@ -50,7 +50,7 @@ //consider updating /mob/living/carbon/human/copy_clothing_prefs() if adding more of these var/underwear = "Nude" //Which underwear the player wants - var/underwear_color = "#000000" + var/underwear_color = COLOR_BLACK var/undershirt = "Nude" //Which undershirt the player wants var/socks = "Nude" //Which socks the player wants var/backpack = DBACKPACK //Which backpack type the player has chosen. diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm index 2b14969f548..fbd56846ecb 100644 --- a/code/modules/mob/living/carbon/human/species_types/vampire.dm +++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm @@ -151,7 +151,7 @@ /obj/item/organ/internal/tongue/vampire name = "vampire tongue" actions_types = list(/datum/action/item_action/organ_action/vampire) - color = "#1C1C1C" + color = COLOR_CRAYON_BLACK COOLDOWN_DECLARE(drain_cooldown) /datum/action/item_action/organ_action/vampire @@ -200,7 +200,7 @@ /obj/item/organ/internal/heart/vampire name = "vampire heart" - color = "#1C1C1C" + color = COLOR_CRAYON_BLACK /obj/item/organ/internal/heart/vampire/on_mob_insert(mob/living/carbon/receiver) . = ..() diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index c64c13b2107..233cc7da653 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -97,7 +97,7 @@ var/datum/atom_hud/data/bot_path/path_hud var/path_image_icon = 'icons/mob/silicon/aibots.dmi' var/path_image_icon_state = "path_indicator" - var/path_image_color = "#FFFFFF" + var/path_image_color = COLOR_WHITE var/reset_access_timer_id var/ignorelistcleanuptimer = 1 // This ticks up every automated action, at 300 we clean the ignore list diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm index 5ab70f0f57d..4a1f1767d85 100644 --- a/code/modules/mob/living/simple_animal/bot/secbot.dm +++ b/code/modules/mob/living/simple_animal/bot/secbot.dm @@ -20,7 +20,7 @@ bot_mode_flags = ~BOT_MODE_CAN_BE_SAPIENT data_hud_type = DATA_HUD_SECURITY_ADVANCED hackables = "target identification systems" - path_image_color = "#FF0000" + path_image_color = COLOR_RED possessed_message = "You are a securitron! Guard the station to the best of your ability!" automated_announcements = list( diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm index bbe0927520b..ba34883489f 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm @@ -124,7 +124,7 @@ While using this makes the system rely on OnFire, it still gives options for tim icon_state = "tumor" pixel_x = -16 base_pixel_x = -16 - light_color = COLOR_SOFT_RED + light_color = "#FA8282" light_range = 3 anchored = TRUE density = FALSE @@ -270,7 +270,7 @@ While using this makes the system rely on OnFire, it still gives options for tim if(elitehere == mychild && activity == TUMOR_PASSIVE) mychild.adjustHealth(-mychild.maxHealth * 0.025*seconds_per_tick) var/obj/effect/temp_visual/heal/H = new /obj/effect/temp_visual/heal(get_turf(mychild)) - H.color = "#FF0000" + H.color = COLOR_RED /obj/structure/elite_tumor/attackby(obj/item/attacking_item, mob/user, params) . = ..() @@ -402,7 +402,7 @@ While using this makes the system rely on OnFire, it still gives options for tim plane = GAME_PLANE color = rgb(255,0,0) light_range = MINIMUM_USEFUL_LIGHT_RANGE - light_color = COLOR_SOFT_RED + light_color = "#FA8282" var/datum/weakref/activator_ref var/datum/weakref/ourelite_ref diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm index d91f312b454..2b1d638ac49 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm @@ -143,13 +143,13 @@ ranged_cooldown = world.time + 100 playsound(src,'sound/voice/insane_low_laugh.ogg', 200, 1) visible_message(span_warning("[src] starts picking up speed!")) - color = "#FF0000" + color = COLOR_RED set_varspeed(0) move_to_delay = 3 addtimer(CALLBACK(src, PROC_REF(reset_rage)), 65) /mob/living/simple_animal/hostile/asteroid/elite/broodmother/proc/reset_rage() - color = "#FFFFFF" + color = COLOR_WHITE set_varspeed(2) move_to_delay = 5 diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm index b2ba6f96540..e9458dd6150 100644 --- a/code/modules/mod/mod_control.dm +++ b/code/modules/mod/mod_control.dm @@ -772,7 +772,7 @@ to_chat(user, span_warning("It's too dangerous to smear [speed_potion] on [src] while it's active!")) return SPEED_POTION_STOP to_chat(user, span_notice("You slather the red gunk over [src], making it faster.")) - set_mod_color("#FF0000") + set_mod_color(COLOR_RED) slowdown_inactive = 0 slowdown_active = 0 update_speed() diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm index bb10c930609..ed857902bc7 100644 --- a/code/modules/modular_computers/computers/item/computer.dm +++ b/code/modules/modular_computers/computers/item/computer.dm @@ -71,7 +71,7 @@ /// How far the computer's light can reach, is not editable by players. var/comp_light_luminosity = 3 /// The built-in light's color, editable by players. - var/comp_light_color = "#FFFFFF" + var/comp_light_color = COLOR_WHITE ///Power usage when the computer is open (screen is active) and can be interacted with. var/base_active_power_usage = 15 // NOVA EDIT CHANGE - Original: 125 diff --git a/code/modules/pai/hud.dm b/code/modules/pai/hud.dm index 1a71b5235b6..b104c7b90ea 100644 --- a/code/modules/pai/hud.dm +++ b/code/modules/pai/hud.dm @@ -268,6 +268,6 @@ var/mob/living/silicon/pai/owner = mymob for(var/atom/movable/screen/pai/button in static_inventory) if(button.required_software) - button.color = owner.installed_software.Find(button.required_software) ? null : "#808080" + button.color = owner.installed_software.Find(button.required_software) ? null : COLOR_GRAY #undef PAI_MISSING_SOFTWARE_MESSAGE diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index eaa4e8627b7..2a9e78e2489 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -25,7 +25,7 @@ custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*0.1) pressure_resistance = 2 grind_results = list(/datum/reagent/iron = 2, /datum/reagent/iodine = 1) - var/colour = "#000000" //what colour the ink is! + var/colour = COLOR_BLACK //what colour the ink is! var/degrees = 0 var/font = PEN_FONT var/requires_gravity = TRUE // can you use this to write in zero-g @@ -71,42 +71,42 @@ /obj/item/pen/blue desc = "It's a normal blue ink pen." icon_state = "pen_blue" - colour = "#0000FF" + colour = COLOR_BLUE /obj/item/pen/red desc = "It's a normal red ink pen." icon_state = "pen_red" - colour = "#FF0000" + colour = COLOR_RED throw_speed = 4 // red ones go faster (in this case, fast enough to embed!) /obj/item/pen/invisible desc = "It's an invisible pen marker." icon_state = "pen" - colour = "#FFFFFF" + colour = COLOR_WHITE /obj/item/pen/fourcolor desc = "It's a fancy four-color ink pen, set to black." name = "four-color pen" icon_state = "pen_4color" - colour = "#000000" + colour = COLOR_BLACK /obj/item/pen/fourcolor/attack_self(mob/living/carbon/user) . = ..() var/chosen_color = "black" switch(colour) - if("#000000") - colour = "#FF0000" + if(COLOR_BLACK) + colour = COLOR_RED chosen_color = "red" throw_speed++ - if("#FF0000") - colour = "#00FF00" + if(COLOR_RED) + colour = COLOR_VIBRANT_LIME chosen_color = "green" throw_speed-- - if("#00FF00") - colour = "#0000FF" + if(COLOR_VIBRANT_LIME) + colour = COLOR_BLUE chosen_color = "blue" else - colour = "#000000" + colour = COLOR_BLACK to_chat(user, span_notice("\The [src] will now write in [chosen_color].")) desc = "It's a fancy four-color ink pen, set to [chosen_color]." @@ -317,7 +317,7 @@ light_system = OVERLAY_LIGHT light_range = 1.5 light_power = 1.3 - light_color = COLOR_SOFT_RED + light_color = "#FA8282" light_on = FALSE dart_insert_projectile_icon_state = "overlay_edagger" /// The real name of our item when extended. @@ -461,7 +461,7 @@ tool_behaviour = TOOL_MINING //For the classic "digging out of prison with a spoon but you're in space so this analogy doesn't work" situation. toolspeed = 10 //You will never willingly choose to use one of these over a shovel. font = FOUNTAIN_PEN_FONT - colour = "#0000FF" + colour = COLOR_BLUE dart_insert_casing_icon_state = "overlay_survivalpen" dart_insert_projectile_icon_state = "overlay_survivalpen_proj" diff --git a/code/modules/plumbing/plumbers/synthesizer.dm b/code/modules/plumbing/plumbers/synthesizer.dm index 0e9cb0c1b11..8f5b46abaa1 100644 --- a/code/modules/plumbing/plumbers/synthesizer.dm +++ b/code/modules/plumbing/plumbers/synthesizer.dm @@ -114,7 +114,7 @@ /obj/machinery/plumbing/synthesizer/update_overlays() . = ..() var/mutable_appearance/r_overlay = mutable_appearance(icon, "[icon_state]_overlay") - r_overlay.color = reagent_id ? initial(reagent_id.color) : "#FFFFFF" + r_overlay.color = reagent_id ? initial(reagent_id.color) : COLOR_WHITE . += r_overlay /obj/machinery/plumbing/synthesizer/soda diff --git a/code/modules/power/lighting/light_mapping_helpers.dm b/code/modules/power/lighting/light_mapping_helpers.dm index db11c77fbef..7a025e7f761 100644 --- a/code/modules/power/lighting/light_mapping_helpers.dm +++ b/code/modules/power/lighting/light_mapping_helpers.dm @@ -32,7 +32,7 @@ bulb_power = 0.6 /obj/machinery/light/red - bulb_colour = "#FF3232" + bulb_colour = COLOR_VIVID_RED nightshift_allowed = FALSE no_low_power = TRUE @@ -59,7 +59,7 @@ brightness = 4 nightshift_brightness = 4 fire_brightness = 4.5 - bulb_colour = "#FFD6AA" + bulb_colour = LIGHT_COLOR_TUNGSTEN fire_colour = "#bd3f46" desc = "A small lighting fixture." light_type = /obj/item/light/bulb @@ -77,7 +77,7 @@ brightness = 2.4 /obj/machinery/light/small/red - bulb_colour = "#FF3232" + bulb_colour = COLOR_VIVID_RED no_low_power = TRUE nightshift_allowed = FALSE fire_colour = "#ff1100" diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index b7cb05a99ea..2ea13ac0e18 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -618,7 +618,7 @@ desc = "Causes kinetic accelerator bolts to have a white tracer trail and explosion." cost = 0 denied_type = /obj/item/borg/upgrade/modkit/tracer - var/bolt_color = "#FFFFFF" + var/bolt_color = COLOR_WHITE /obj/item/borg/upgrade/modkit/tracer/modify_projectile(obj/projectile/kinetic/K) K.icon_state = "ka_tracer" diff --git a/code/modules/projectiles/guns/special/hand_of_midas.dm b/code/modules/projectiles/guns/special/hand_of_midas.dm index 5c9cb1fd978..6a5ccf2dea1 100644 --- a/code/modules/projectiles/guns/special/hand_of_midas.dm +++ b/code/modules/projectiles/guns/special/hand_of_midas.dm @@ -100,7 +100,7 @@ armour_penetration = 50 hitsound = 'sound/effects/coin2.ogg' icon_state = "pellet" - color = "#FFD700" + color = COLOR_GOLD /// The gold charge in this pellet var/gold_charge = 0 diff --git a/code/modules/projectiles/pins.dm b/code/modules/projectiles/pins.dm index 6f80bf0e214..77d6a702b49 100644 --- a/code/modules/projectiles/pins.dm +++ b/code/modules/projectiles/pins.dm @@ -137,7 +137,7 @@ /obj/item/firing_pin/clown name = "hilarious firing pin" desc = "Advanced clowntech that can convert any firearm into a far more useful object." - color = "#FFFF00" + color = COLOR_YELLOW fail_message = "honk!" force_replace = TRUE @@ -221,7 +221,7 @@ /obj/item/firing_pin/paywall name = "paywall firing pin" desc = "A firing pin with a built-in configurable paywall." - color = "#FFD700" + color = COLOR_GOLD fail_message = "" ///list of account IDs which have accepted the license prompt. If this is the multi-payment pin, then this means they accepted the waiver that each shot will cost them money var/list/gun_owners = list() diff --git a/code/modules/projectiles/projectile/bullets/cannonball.dm b/code/modules/projectiles/projectile/bullets/cannonball.dm index 2f57a3dcc99..1d6108ed33f 100644 --- a/code/modules/projectiles/projectile/bullets/cannonball.dm +++ b/code/modules/projectiles/projectile/bullets/cannonball.dm @@ -42,7 +42,7 @@ /obj/projectile/bullet/cannonball/explosive name = "explosive shell" - color = "#FF0000" + color = COLOR_RED projectile_piercing = NONE damage = 40 //set to 30 before first mob impact, but they're gonna be gibbed by the explosion diff --git a/code/modules/projectiles/projectile/bullets/shotgun.dm b/code/modules/projectiles/projectile/bullets/shotgun.dm index 9bdd5a145ea..914019b9792 100644 --- a/code/modules/projectiles/projectile/bullets/shotgun.dm +++ b/code/modules/projectiles/projectile/bullets/shotgun.dm @@ -54,7 +54,7 @@ jitter = 40 SECONDS range = 7 icon_state = "spark" - color = "#FFFF00" + color = COLOR_YELLOW embedding = null /obj/projectile/bullet/shotgun_frag12 diff --git a/code/modules/projectiles/projectile/energy/nuclear_particle.dm b/code/modules/projectiles/projectile/energy/nuclear_particle.dm index c2a2247a00e..4cd2ea049e0 100644 --- a/code/modules/projectiles/projectile/energy/nuclear_particle.dm +++ b/code/modules/projectiles/projectile/energy/nuclear_particle.dm @@ -10,12 +10,12 @@ hitsound = 'sound/weapons/emitter2.ogg' impact_type = /obj/effect/projectile/impact/xray var/static/list/particle_colors = list( - "red" = "#FF0000", - "blue" = "#00FF00", - "green" = "#0000FF", - "yellow" = "#FFFF00", - "cyan" = "#00FFFF", - "purple" = "#FF00FF" + "red" = COLOR_RED, + "blue" = COLOR_VIBRANT_LIME, + "green" = COLOR_BLUE, + "yellow" = COLOR_YELLOW, + "cyan" = COLOR_CYAN, + "purple" = COLOR_MAGENTA ) /obj/projectile/energy/nuclear_particle/Initialize(mapload) diff --git a/code/modules/projectiles/projectile/energy/stun.dm b/code/modules/projectiles/projectile/energy/stun.dm index ab725e1d6fa..0d279b083d0 100644 --- a/code/modules/projectiles/projectile/energy/stun.dm +++ b/code/modules/projectiles/projectile/energy/stun.dm @@ -1,8 +1,9 @@ /obj/projectile/energy/electrode name = "electrode" icon_state = "spark" - color = "#FFFF00" + color = COLOR_YELLOW stamina = 80 // NOVA EDIT CHANGE + paralyze = 10 SECONDS stutter = 10 SECONDS jitter = 40 SECONDS hitsound = 'sound/weapons/taserhit.ogg' diff --git a/code/modules/projectiles/projectile/special/gravity.dm b/code/modules/projectiles/projectile/special/gravity.dm index 1a23b653a05..5fbcbb98dd6 100644 --- a/code/modules/projectiles/projectile/special/gravity.dm +++ b/code/modules/projectiles/projectile/special/gravity.dm @@ -5,7 +5,7 @@ hitsound = 'sound/weapons/wave.ogg' damage = 0 damage_type = BRUTE - color = "#33CCFF" + color = COLOR_BLUE_LIGHT var/turf/T var/power = 4 var/list/thrown_items = list() @@ -72,7 +72,7 @@ hitsound = 'sound/weapons/wave.ogg' damage = 0 damage_type = BRUTE - color = "#101010" + color = COLOR_FULL_TONER_BLACK var/turf/T var/power = 4 var/list/thrown_items = list() diff --git a/code/modules/projectiles/projectile/special/wormhole.dm b/code/modules/projectiles/projectile/special/wormhole.dm index 90eadd0bb09..dbcb6f4cf8b 100644 --- a/code/modules/projectiles/projectile/special/wormhole.dm +++ b/code/modules/projectiles/projectile/special/wormhole.dm @@ -6,7 +6,7 @@ pass_flags = PASSGLASS | PASSTABLE | PASSGRILLE | PASSMOB //Weakref to the thing that shot us var/datum/weakref/gun - color = "#33CCFF" + color = COLOR_BLUE_LIGHT tracer_type = /obj/effect/projectile/tracer/wormhole impact_type = /obj/effect/projectile/impact/wormhole muzzle_type = /obj/effect/projectile/muzzle/wormhole diff --git a/code/modules/reagents/chemistry/holder/ui_data.dm b/code/modules/reagents/chemistry/holder/ui_data.dm index 39ceaaa06f0..97820c2fd6c 100644 --- a/code/modules/reagents/chemistry/holder/ui_data.dm +++ b/code/modules/reagents/chemistry/holder/ui_data.dm @@ -171,7 +171,7 @@ has_product = FALSE var/list/names = splittext("[reaction.type]", "/") var/product_name = names[names.len] - data["reagent_mode_recipe"] = list("name" = product_name, "id" = reaction.type, "hasProduct" = has_product, "reagentCol" = "#FFFFFF", "thermodynamics" = generate_thermodynamic_profile(reaction), "explosive" = generate_explosive_profile(reaction), "lowerpH" = reaction.optimal_ph_min, "upperpH" = reaction.optimal_ph_max, "thermics" = determine_reaction_thermics(reaction), "thermoUpper" = reaction.rate_up_lim, "minPurity" = reaction.purity_min, "inversePurity" = "N/A", "tempMin" = reaction.required_temp, "explodeTemp" = reaction.overheat_temp, "reqContainer" = container_name, "subReactLen" = 1, "subReactIndex" = 1) + data["reagent_mode_recipe"] = list("name" = product_name, "id" = reaction.type, "hasProduct" = has_product, "reagentCol" = COLOR_WHITE, "thermodynamics" = generate_thermodynamic_profile(reaction), "explosive" = generate_explosive_profile(reaction), "lowerpH" = reaction.optimal_ph_min, "upperpH" = reaction.optimal_ph_max, "thermics" = determine_reaction_thermics(reaction), "thermoUpper" = reaction.rate_up_lim, "minPurity" = reaction.purity_min, "inversePurity" = "N/A", "tempMin" = reaction.required_temp, "explodeTemp" = reaction.overheat_temp, "reqContainer" = container_name, "subReactLen" = 1, "subReactIndex" = 1) //If we do have a product then we find it else diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm index f51532b28b1..11947c70602 100644 --- a/code/modules/reagents/chemistry/reagents.dm +++ b/code/modules/reagents/chemistry/reagents.dm @@ -29,7 +29,7 @@ ///The molar mass of the reagent - if you're adding a reagent that doesn't have a recipe, just add a random number between 10 - 800. Higher numbers are "harder" but it's mostly arbitary. var/mass /// color it looks in containers etc - var/color = "#000000" // rgb: 0, 0, 0 + var/color = COLOR_BLACK // rgb: 0, 0, 0 ///how fast the reagent is metabolized by the mob var/metabolization_rate = REAGENTS_METABOLISM /// above this overdoses happen diff --git a/code/modules/reagents/chemistry/reagents/atmos_gas_reagents.dm b/code/modules/reagents/chemistry/reagents/atmos_gas_reagents.dm index 1406e373693..5b425d61f8a 100644 --- a/code/modules/reagents/chemistry/reagents/atmos_gas_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/atmos_gas_reagents.dm @@ -113,7 +113,7 @@ description = "A gas that is eight times more efficient than O2 at lung diffusion with organ healing properties on sleeping patients." reagent_state = GAS metabolization_rate = REAGENTS_METABOLISM * 0.5 - color = "#808080" + color = COLOR_GRAY taste_description = "irradiated air" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE diff --git a/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm index 971d2057bb3..6de1a0d21ad 100644 --- a/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm @@ -716,7 +716,7 @@ . = ..() to_chat(drinker, span_notice("You feel gentle warmth spread through your body!")) light_holder = new(drinker) - light_holder.set_light(3, 0.7, "#FFCC00") //Tequila Sunrise makes you radiate dim light, like a sunrise! + light_holder.set_light(3, 0.7, COLOR_TANGERINE_YELLOW) //Tequila Sunrise makes you radiate dim light, like a sunrise! /datum/reagent/consumable/ethanol/tequila_sunrise/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) if(QDELETED(light_holder)) @@ -746,7 +746,7 @@ /datum/reagent/consumable/ethanol/beepsky_smash name = "Beepsky Smash" description = "Drink this and prepare for the LAW." - color = "#808000" // rgb: 128,128,0 + color = COLOR_OLIVE // rgb: 128,128,0 boozepwr = 60 //THE FIST OF THE LAW IS STRONG AND HARD quality = DRINK_GOOD metabolization_rate = 1.25 * REAGENTS_METABOLISM @@ -952,7 +952,7 @@ /datum/reagent/consumable/ethanol/snowwhite name = "Snow White" description = "A cold refreshment." - color = "#FFFFFF" // rgb: 255, 255, 255 + color = COLOR_WHITE // rgb: 255, 255, 255 boozepwr = 35 quality = DRINK_NICE taste_description = "refreshing cold" @@ -1544,7 +1544,7 @@ /datum/reagent/consumable/ethanol/triple_sec name = "Triple Sec" description = "A sweet and vibrant orange liqueur." - color = "#ffcc66" + color = COLOR_ICECREAM_PEACH boozepwr = 30 taste_description = "a warm flowery orange taste which recalls the ocean air and summer wind of the caribbean" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED @@ -1631,7 +1631,7 @@ /datum/reagent/consumable/ethanol/bastion_bourbon name = "Bastion Bourbon" description = "Soothing hot herbal brew with restorative properties. Hints of citrus and berry flavors." - color = "#00FFFF" + color = COLOR_CYAN boozepwr = 30 quality = DRINK_FANTASTIC taste_description = "hot herbal brew with a hint of fruit" @@ -1673,7 +1673,7 @@ /datum/reagent/consumable/ethanol/squirt_cider name = "Squirt Cider" description = "Fermented squirt extract with a nose of stale bread and ocean water. Whatever a squirt is." - color = "#FF0000" + color = COLOR_RED boozepwr = 40 taste_description = "stale bread with a staler aftertaste" nutriment_factor = 2 @@ -1947,7 +1947,7 @@ /datum/reagent/consumable/ethanol/fruit_wine name = "Fruit Wine" description = "A wine made from grown plants." - color = "#FFFFFF" + color = COLOR_WHITE boozepwr = 35 quality = DRINK_GOOD taste_description = "bad coding" @@ -2410,7 +2410,7 @@ name = "Triumphal Arch" description = "A drink celebrating the Lizard Empire and its military victories. It's popular at bars on Unification Day." boozepwr = 60 - color = "#FFD700" + color = COLOR_GOLD quality = DRINK_FANTASTIC taste_description = "victory" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED diff --git a/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm index c31b7e7079c..b426bc4317b 100644 --- a/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm @@ -545,7 +545,7 @@ /datum/reagent/consumable/space_up name = "Space-Up" description = "Tastes like a hull breach in your mouth." - color = "#00FF00" // rgb: 0, 255, 0 + color = COLOR_VIBRANT_LIME // rgb: 0, 255, 0 taste_description = "cherry soda" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED @@ -1125,7 +1125,7 @@ /datum/reagent/consumable/funky_monkey name = "funky monkey smoothie" description = "A classic smoothie made from chocolate and bananas." - color = "#663300" + color = COLOR_BROWNER_BROWN nutriment_factor = 0 taste_description = "chocolate and banana" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED @@ -1133,7 +1133,7 @@ /datum/reagent/consumable/green_giant name = "green giant smoothie" description = "A green vegetable smoothie, made without vegetables." - color = "#003300" + color = COLOR_VERY_DARK_LIME_GREEN nutriment_factor = 0 taste_description = "green, just green" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm index 0172c65c3d7..7204f9061ca 100644 --- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm @@ -445,7 +445,7 @@ name = "Maintenance Tar" description = "An unknown tar that you most likely gotten from an assistant, a bored chemist... or cooked yourself. Raw tar, straight from the floor. It can help you with escaping bad situations at the cost of liver damage." reagent_state = LIQUID - color = "#000000" + color = COLOR_BLACK overdose_threshold = 30 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED addiction_types = list(/datum/addiction/maintenance_drugs = 5) diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index b9abdb3bd25..48109d09bed 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -282,7 +282,7 @@ name = "Sugar" description = "The organic compound commonly known as table sugar and sometimes called saccharose. This white, odorless, crystalline powder has a pleasing, sweet taste." reagent_state = SOLID - color = "#FFFFFF" // rgb: 255, 255, 255 + color = COLOR_WHITE // rgb: 255, 255, 255 taste_mult = 1.5 // stop sugar drowning out other flavours nutriment_factor = 2 metabolization_rate = 5 * REAGENTS_METABOLISM @@ -457,7 +457,7 @@ name = "Table Salt" description = "A salt made of sodium chloride. Commonly used to season food." reagent_state = SOLID - color = "#FFFFFF" // rgb: 255,255,255 + color = COLOR_WHITE // rgb: 255,255,255 taste_description = "salt" penetrates_skin = NONE chemical_flags = REAGENT_CAN_BE_SYNTHESIZED @@ -568,7 +568,7 @@ /datum/reagent/consumable/sprinkles name = "Sprinkles" description = "Multi-colored little bits of sugar, commonly found on donuts. Loved by cops." - color = "#FF00FF" // rgb: 255, 0, 255 + color = COLOR_MAGENTA // rgb: 255, 0, 255 taste_description = "childhood whimsy" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED @@ -633,7 +633,7 @@ name = "Flour" description = "This is what you rub all over yourself to pretend to be a ghost." reagent_state = SOLID - color = "#FFFFFF" // rgb: 0, 0, 0 + color = COLOR_WHITE // rgb: 0, 0, 0 taste_description = "chalky wheat" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_AFFECTS_WOUNDS default_container = /obj/item/reagent_containers/condiment/flour @@ -698,7 +698,7 @@ description = "tiny nutritious grains" reagent_state = SOLID nutriment_factor = 3 - color = "#FFFFFF" // rgb: 0, 0, 0 + color = COLOR_WHITE // rgb: 0, 0, 0 taste_description = "rice" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED default_container = /obj/item/reagent_containers/condiment/rice @@ -707,7 +707,7 @@ name = "Rice Flour" description = "Flour mixed with Rice" reagent_state = SOLID - color = "#FFFFFF" // rgb: 0, 0, 0 + color = COLOR_WHITE // rgb: 0, 0, 0 taste_description = "chalky wheat with rice" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED @@ -966,7 +966,7 @@ nutriment_factor = 0 metabolization_rate = 2 * REAGENTS_METABOLISM reagent_state = SOLID - color = "#FFFFFF" // rgb: 255, 255, 255 + color = COLOR_WHITE // rgb: 255, 255, 255 taste_mult = 8 taste_description = "sweetness" overdose_threshold = 17 @@ -1038,7 +1038,7 @@ /datum/reagent/consumable/chocolatepudding name = "Chocolate Pudding" description = "A great dessert for chocolate lovers." - color = "#800000" + color = COLOR_MAROON quality = DRINK_VERYGOOD nutriment_factor = 4 taste_description = "sweet chocolate" @@ -1103,7 +1103,7 @@ name = "Korta Milk" description = "A milky liquid made by crushing the centre of a korta nut." taste_description = "sugary milk" - color = "#FFFFFF" + color = COLOR_WHITE chemical_flags = REAGENT_CAN_BE_SYNTHESIZED /datum/reagent/consumable/korta_nectar diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 63f58d262e8..38602b9dfda 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -81,7 +81,7 @@ /datum/reagent/medicine/synaptizine name = "Synaptizine" description = "Increases resistance to stuns as well as reducing drowsiness and hallucinations." - color = "#FF00FF" + color = COLOR_MAGENTA ph = 4 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED @@ -548,7 +548,7 @@ name = "Salbutamol" description = "Rapidly restores oxygen deprivation as well as preventing more of it to an extent." reagent_state = LIQUID - color = "#00FFFF" + color = COLOR_CYAN metabolization_rate = 0.25 * REAGENTS_METABOLISM ph = 2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED @@ -1034,7 +1034,7 @@ /datum/reagent/medicine/neurine name = "Neurine" description = "Reacts with neural tissue, helping reform damaged connections. Can cure minor traumas." - color = "#C0C0C0" //ditto + color = COLOR_SILVER //ditto chemical_flags = REAGENT_CAN_BE_SYNTHESIZED | REAGENT_DEAD_PROCESS purity = REAGENT_STANDARD_PURITY inverse_chem_val = 0.5 @@ -1401,7 +1401,7 @@ /datum/reagent/medicine/cordiolis_hepatico name = "Cordiolis Hepatico" description = "A strange, pitch-black reagent that seems to absorb all light. Effects unknown." - color = "#000000" + color = COLOR_BLACK self_consuming = TRUE chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index e6a69d3216e..4a98afc3e98 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -662,10 +662,10 @@ head.head_flags |= HEAD_HAIR //No hair? No problem! if(!HAS_TRAIT(affected_human, TRAIT_SHAVED)) affected_human.set_facial_hairstyle("Shaved", update = FALSE) - affected_human.set_facial_haircolor("#000000", update = FALSE) + affected_human.set_facial_haircolor(COLOR_BLACK, update = FALSE) if(!HAS_TRAIT(affected_human, TRAIT_BALD)) affected_human.set_hairstyle("Spiky", update = FALSE) - affected_human.set_haircolor("#000000", update = FALSE) + affected_human.set_haircolor(COLOR_BLACK, update = FALSE) if(HAS_TRAIT(affected_human, TRAIT_USES_SKINTONES)) affected_human.skin_tone = "orange" else if(HAS_TRAIT(affected_human, TRAIT_MUTANT_COLORS) && !HAS_TRAIT(affected_human, TRAIT_FIXED_MUTANT_COLORS)) //Aliens with custom colors simply get turned orange @@ -937,7 +937,7 @@ name = "Oxygen" description = "A colorless, odorless gas. Grows on trees but is still pretty valuable." reagent_state = GAS - color = "#808080" // rgb: 128, 128, 128 + color = COLOR_GRAY taste_mult = 0 // oderless and tasteless ph = 9.2//It's acutally a huge range and very dependant on the chemistry but ph is basically a made up var in it's implementation anyways chemical_flags = REAGENT_CAN_BE_SYNTHESIZED @@ -972,7 +972,7 @@ name = "Nitrogen" description = "A colorless, odorless, tasteless gas. A simple asphyxiant that can silently displace vital oxygen." reagent_state = GAS - color = "#808080" // rgb: 128, 128, 128 + color = COLOR_GRAY taste_mult = 0 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED @@ -985,7 +985,7 @@ name = "Hydrogen" description = "A colorless, odorless, nonmetallic, tasteless, highly combustible diatomic gas." reagent_state = GAS - color = "#808080" // rgb: 128, 128, 128 + color = COLOR_GRAY taste_mult = 0 ph = 0.1//Now I'm stuck in a trap of my own design. Maybe I should make -ve phes? (not 0 so I don't get div/0 errors) chemical_flags = REAGENT_CAN_BE_SYNTHESIZED @@ -1001,7 +1001,7 @@ /datum/reagent/mercury name = "Mercury" description = "A curious metal that's a liquid at room temperature. Neurodegenerative and very bad for the mind." - color = "#484848" // rgb: 72, 72, 72A + color = COLOR_WEBSAFE_DARK_GRAY // rgb: 72, 72, 72A taste_mult = 0 // apparently tasteless. chemical_flags = REAGENT_CAN_BE_SYNTHESIZED @@ -1067,7 +1067,7 @@ name = "Fluorine" description = "A comically-reactive chemical element. The universe does not want this stuff to exist in this form in the slightest." reagent_state = GAS - color = "#808080" // rgb: 128, 128, 128 + color = COLOR_GRAY taste_description = "acid" ph = 2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED @@ -1088,7 +1088,7 @@ name = "Sodium" description = "A soft silver metal that can easily be cut with a knife. It's not salt just yet, so refrain from putting it on your chips." reagent_state = SOLID - color = "#808080" // rgb: 128, 128, 128 + color = COLOR_GRAY taste_description = "salty metal" ph = 11.6 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED @@ -1112,7 +1112,7 @@ name = "Lithium" description = "A silver metal, its claim to fame is its remarkably low density. Using it is a bit too effective in calming oneself down." reagent_state = SOLID - color = "#808080" // rgb: 128, 128, 128 + color = COLOR_GRAY taste_description = "metal" ph = 11.3 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED @@ -1467,7 +1467,7 @@ /datum/reagent/snail name = "Agent-S" description = "Virological agent that infects the subject with Gastrolosis." - color = "#003300" // rgb(0, 51, 0) + color = COLOR_VERY_DARK_LIME_GREEN // rgb(0, 51, 0) taste_description = "goo" penetrates_skin = NONE ph = 11 @@ -1558,7 +1558,7 @@ used alongside sanguirite to allow blood clotting to continue." reagent_state = LIQUID metabolization_rate = 1.5 * REAGENTS_METABOLISM - color = "#808080" + color = COLOR_GRAY taste_description = "sweetness" ph = 5.8 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED @@ -1734,7 +1734,7 @@ /datum/reagent/plantnutriment name = "Generic Nutriment" description = "Some kind of nutriment. You can't really tell what it is. You should probably report it, along with how you obtained it." - color = "#000000" // RBG: 0, 0, 0 + color = COLOR_BLACK // RBG: 0, 0, 0 var/tox_prob = 0 taste_description = "plant food" ph = 3 @@ -1946,7 +1946,7 @@ /datum/reagent/carpet/royal/black name = "Royal Black Carpet" description = "For those that feel the need to show off their timewasting skills." - color = "#000000" + color = COLOR_BLACK taste_description = "royalty" carpet_type = /turf/open/floor/carpet/royalblack chemical_flags = REAGENT_CAN_BE_SYNTHESIZED @@ -2481,7 +2481,7 @@ /datum/reagent/glitter name = "Generic Glitter" description = "if you can see this description, contact a coder." - color = "#FFFFFF" //pure white + color = COLOR_WHITE //pure white taste_description = "plastic" reagent_state = SOLID var/glitter_type = /obj/effect/decal/cleanable/glitter @@ -2689,7 +2689,7 @@ /datum/reagent/wittel name = "Wittel" description = "An extremely rare metallic-white substance only found on demon-class planets." - color = "#FFFFFF" // rgb: 255, 255, 255 + color = COLOR_WHITE // rgb: 255, 255, 255 taste_mult = 0 // oderless and tasteless chemical_flags = REAGENT_CAN_BE_SYNTHESIZED diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm index 30757231625..9ccf08b5fe5 100644 --- a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm @@ -20,7 +20,7 @@ /datum/reagent/nitroglycerin name = "Nitroglycerin" description = "Nitroglycerin is a heavy, colorless, oily, explosive liquid obtained by nitrating glycerol." - color = "#808080" // rgb: 128, 128, 128 + color = COLOR_GRAY taste_description = "oil" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED @@ -28,7 +28,7 @@ name = "Stabilizing Agent" description = "Keeps unstable chemicals stable. This does not work on everything." reagent_state = LIQUID - color = "#FFFF00" + color = COLOR_YELLOW taste_description = "metal" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED @@ -95,7 +95,7 @@ name = "Gunpowder" description = "Explodes. Violently." reagent_state = LIQUID - color = "#000000" + color = COLOR_BLACK metabolization_rate = 0.125 * REAGENTS_METABOLISM taste_description = "salt" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED @@ -124,7 +124,7 @@ name = "RDX" description = "Military grade explosive" reagent_state = SOLID - color = "#FFFFFF" + color = COLOR_WHITE taste_description = "salt" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED @@ -132,7 +132,7 @@ name = "TaTP" description = "Suicide grade explosive" reagent_state = SOLID - color = "#FFFFFF" + color = COLOR_WHITE taste_description = "death" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index c98cec7cc9e..d9f4073cba8 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -39,7 +39,7 @@ /datum/reagent/toxin/mutagen name = "Unstable Mutagen" description = "Might cause unpredictable mutations. Keep away from children." - color = "#00FF00" + color = COLOR_VIBRANT_LIME creation_purity = REAGENT_STANDARD_PURITY purity = REAGENT_STANDARD_PURITY toxpwr = 0 @@ -830,7 +830,7 @@ description = "Sodium Thiopental induces heavy weakness in its target as well as unconsciousness." silent_toxin = TRUE reagent_state = LIQUID - color = "#6496FA" + color = LIGHT_COLOR_BLUE metabolization_rate = 0.75 * REAGENTS_METABOLISM toxpwr = 0 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE @@ -866,7 +866,7 @@ description = "A very powerful delayed toxin. Upon full metabolization, a massive amount of toxin damage will be dealt depending on how long it has been in the victim's bloodstream." silent_toxin = TRUE reagent_state = LIQUID - color = "#FFFFFF" + color = COLOR_WHITE toxpwr = 0 metabolization_rate = 0.5 * REAGENTS_METABOLISM chemical_flags = REAGENT_CAN_BE_SYNTHESIZED @@ -1275,7 +1275,7 @@ description = "A colorless, oderless, tasteless neurotoxin usually carried by livers of animals of the Tetraodontiformes order." silent_toxin = TRUE reagent_state = SOLID - color = "#EEEEEE" + color = COLOR_VERY_LIGHT_GRAY metabolization_rate = 0.1 * REAGENTS_METABOLISM toxpwr = 0 taste_mult = 0 diff --git a/code/modules/religion/festival/instrument_rites.dm b/code/modules/religion/festival/instrument_rites.dm index 4b5c1afa18b..3bcf3224d37 100644 --- a/code/modules/religion/festival/instrument_rites.dm +++ b/code/modules/religion/festival/instrument_rites.dm @@ -68,7 +68,7 @@ ///particle effect of playing this tune var/particles_path = /particles/musical_notes ///what the instrument will glow when playing - var/glow_color = "#000000" + var/glow_color = COLOR_BLACK /datum/religion_rites/song_tuner/invoke_effect(mob/living/user, obj/structure/altar_of_gods/altar) . = ..() diff --git a/code/modules/religion/sparring/ceremonial_gear.dm b/code/modules/religion/sparring/ceremonial_gear.dm index c21920af410..08ab6940805 100644 --- a/code/modules/religion/sparring/ceremonial_gear.dm +++ b/code/modules/religion/sparring/ceremonial_gear.dm @@ -10,7 +10,7 @@ greyscale_config = /datum/greyscale_config/ceremonial_blade greyscale_config_inhand_left = /datum/greyscale_config/ceremonial_blade_lefthand greyscale_config_inhand_right = /datum/greyscale_config/ceremonial_blade_righthand - greyscale_colors = "#FFFFFF" + greyscale_colors = COLOR_WHITE hitsound = 'sound/weapons/bladeslice.ogg' custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*6) //Defaults to an Iron blade. diff --git a/code/modules/research/xenobiology/crossbreeding/__corecross.dm b/code/modules/research/xenobiology/crossbreeding/__corecross.dm index b83a0a5b7f4..a68bc9258de 100644 --- a/code/modules/research/xenobiology/crossbreeding/__corecross.dm +++ b/code/modules/research/xenobiology/crossbreeding/__corecross.dm @@ -46,7 +46,7 @@ To add a crossbreed: /obj/item/slimecross/Initialize(mapload) . = ..() name = effect + " " + colour + " extract" - var/itemcolor = "#FFFFFF" + var/itemcolor = COLOR_WHITE switch(colour) if(SLIME_TYPE_ORANGE) itemcolor = "#FFA500" @@ -57,15 +57,15 @@ To add a crossbreed: if(SLIME_TYPE_METAL) itemcolor = "#7E7E7E" if(SLIME_TYPE_YELLOW) - itemcolor = "#FFFF00" + itemcolor = COLOR_YELLOW if(SLIME_TYPE_DARK_PURPLE) - itemcolor = "#551A8B" + itemcolor = COLOR_DARK_PURPLE if(SLIME_TYPE_DARK_BLUE) - itemcolor = "#0000FF" + itemcolor = COLOR_BLUE if(SLIME_TYPE_SILVER) itemcolor = "#D3D3D3" if(SLIME_TYPE_BLUESPACE) - itemcolor = "#32CD32" + itemcolor = COLOR_LIME if(SLIME_TYPE_SEPIA) itemcolor = "#704214" if(SLIME_TYPE_CERULEAN) @@ -73,17 +73,17 @@ To add a crossbreed: if(SLIME_TYPE_PYRITE) itemcolor = "#FAFAD2" if(SLIME_TYPE_RED) - itemcolor = "#FF0000" + itemcolor = COLOR_RED if(SLIME_TYPE_GREEN) - itemcolor = "#00FF00" + itemcolor = COLOR_VIBRANT_LIME if(SLIME_TYPE_PINK) itemcolor = "#FF69B4" if(SLIME_TYPE_GOLD) - itemcolor = "#FFD700" + itemcolor = COLOR_GOLD if(SLIME_TYPE_OIL) itemcolor = "#505050" if(SLIME_TYPE_BLACK) - itemcolor = "#000000" + itemcolor = COLOR_BLACK if(SLIME_TYPE_LIGHT_PINK) itemcolor = "#FFB6C1" if(SLIME_TYPE_ADAMANTINE) @@ -119,7 +119,7 @@ To add a crossbreed: /obj/item/slimecrossbeaker/bloodpack //Pack of 50u blood. Deletes on empty. name = "blood extract" desc = "A sphere of liquid blood, somehow managing to stay together." - color = "#FF0000" + color = COLOR_RED list_reagents = list(/datum/reagent/blood = 50) /obj/item/slimecrossbeaker/pax //5u synthpax. @@ -131,7 +131,7 @@ To add a crossbreed: /obj/item/slimecrossbeaker/omnizine //15u omnizine. name = "healing extract" desc = "A gelatinous extract of pure omnizine." - color = "#FF00FF" + color = COLOR_MAGENTA list_reagents = list(/datum/reagent/medicine/omnizine = 15) /obj/item/slimecrossbeaker/autoinjector //As with the above, but automatically injects whomever it is used on with contents. @@ -165,7 +165,7 @@ To add a crossbreed: ignore_flags = TRUE //It is, after all, intended to heal. name = "mending solution" desc = "A strange glob of sweet-smelling semifluid, which seems to stick to skin rather easily." - color = "#FF00FF" + color = COLOR_MAGENTA list_reagents = list(/datum/reagent/medicine/regen_jelly = 20) /obj/item/slimecrossbeaker/autoinjector/slimejelly //Primarily for slimepeople, but you do you. @@ -173,7 +173,7 @@ To add a crossbreed: ignore_flags = TRUE name = "slime jelly bubble" desc = "A sphere of slime jelly. It seems to stick to your skin, but avoids other surfaces." - color = "#00FF00" + color = COLOR_VIBRANT_LIME list_reagents = list(/datum/reagent/toxin/slimejelly = 50) /obj/item/slimecrossbeaker/autoinjector/peaceandlove @@ -189,5 +189,5 @@ To add a crossbreed: /obj/item/slimecrossbeaker/autoinjector/slimestimulant name = "invigorating gel" desc = "A bubbling purple mixture, designed to heal and boost movement." - color = "#FF00FF" + color = COLOR_MAGENTA list_reagents = list(/datum/reagent/medicine/regen_jelly = 30, /datum/reagent/drug/methamphetamine = 9) diff --git a/code/modules/research/xenobiology/crossbreeding/_clothing.dm b/code/modules/research/xenobiology/crossbreeding/_clothing.dm index 5eac20667cc..631e0695355 100644 --- a/code/modules/research/xenobiology/crossbreeding/_clothing.dm +++ b/code/modules/research/xenobiology/crossbreeding/_clothing.dm @@ -37,7 +37,7 @@ Slimecrossing Armor icon = 'icons/obj/science/slimecrossing.dmi' icon_state = "prismglasses" actions_types = list(/datum/action/item_action/change_prism_colour, /datum/action/item_action/place_light_prism) - var/glasses_color = "#FFFFFF" + var/glasses_color = COLOR_WHITE /obj/item/clothing/glasses/prism_glasses/item_action_slot_check(slot) if(slot & ITEM_SLOT_EYES) diff --git a/code/modules/research/xenobiology/crossbreeding/_potions.dm b/code/modules/research/xenobiology/crossbreeding/_potions.dm index 7fb7f10849d..9121a0d0ce4 100644 --- a/code/modules/research/xenobiology/crossbreeding/_potions.dm +++ b/code/modules/research/xenobiology/crossbreeding/_potions.dm @@ -127,7 +127,7 @@ Slimecrossing Potions to_chat(user, span_notice("You slather the blue gunk over the [C], making it airtight.")) C.name = "pressure-resistant [C.name]" C.remove_atom_colour(WASHABLE_COLOUR_PRIORITY) - C.add_atom_colour("#000080", FIXED_COLOUR_PRIORITY) + C.add_atom_colour(COLOR_NAVY, FIXED_COLOUR_PRIORITY) C.min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT C.cold_protection = C.body_parts_covered C.clothing_flags |= STOPSPRESSUREDAMAGE @@ -166,7 +166,7 @@ Slimecrossing Potions to_chat(user, span_notice("You slather the red gunk over the [C], making it lavaproof.")) C.name = "lavaproof [C.name]" C.remove_atom_colour(WASHABLE_COLOUR_PRIORITY) - C.add_atom_colour("#800000", FIXED_COLOUR_PRIORITY) + C.add_atom_colour(COLOR_MAROON, FIXED_COLOUR_PRIORITY) C.resistance_flags |= LAVA_PROOF if (isclothing(C)) var/obj/item/clothing/CL = C diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm index a1d4eff50a6..ed236be2d3f 100644 --- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm +++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm @@ -528,7 +528,7 @@ // Technically, "healed this tick" by now. if(healed_last_tick) - new /obj/effect/temp_visual/heal(get_turf(owner), "#FF0000") + new /obj/effect/temp_visual/heal(get_turf(owner), COLOR_RED) return ..() diff --git a/code/modules/research/xenobiology/crossbreeding/consuming.dm b/code/modules/research/xenobiology/crossbreeding/consuming.dm index 84084b2302e..bffc1525694 100644 --- a/code/modules/research/xenobiology/crossbreeding/consuming.dm +++ b/code/modules/research/xenobiology/crossbreeding/consuming.dm @@ -293,7 +293,7 @@ Consuming extracts: desc = "A yellow cookie with rainbow-colored icing. Reflects the light strangely." icon_state = "pyrite" taste = "vanilla and " //Randomly selected color dye. - var/colour = "#FFFFFF" + var/colour = COLOR_WHITE /obj/item/slime_cookie/pyrite/Initialize(mapload) . = ..() @@ -301,25 +301,25 @@ Consuming extracts: switch(rand(1,7)) if(1) tastemessage = "red dye" - colour = "#FF0000" + colour = COLOR_RED if(2) tastemessage = "orange dye" colour = "#FFA500" if(3) tastemessage = "yellow dye" - colour = "#FFFF00" + colour = COLOR_YELLOW if(4) tastemessage = "green dye" - colour = "#00FF00" + colour = COLOR_VIBRANT_LIME if(5) tastemessage = "blue dye" - colour = "#0000FF" + colour = COLOR_BLUE if(6) tastemessage = "indigo dye" colour = "#4B0082" if(7) tastemessage = "violet dye" - colour = "#FF00FF" + colour = COLOR_MAGENTA taste += tastemessage /obj/item/slime_cookie/pyrite/do_effect(mob/living/M, mob/user) diff --git a/code/modules/research/xenobiology/crossbreeding/prismatic.dm b/code/modules/research/xenobiology/crossbreeding/prismatic.dm index 95e3c77e4d6..3f8509c1a7c 100644 --- a/code/modules/research/xenobiology/crossbreeding/prismatic.dm +++ b/code/modules/research/xenobiology/crossbreeding/prismatic.dm @@ -8,7 +8,7 @@ Prismatic extracts: effect = "prismatic" effect_desc = "When used it paints whatever it hits." icon_state = "prismatic" - var/paintcolor = "#FFFFFF" + var/paintcolor = COLOR_WHITE /obj/item/slimecross/prismatic/afterattack(turf/target, mob/user, proximity) if(!proximity) @@ -47,15 +47,15 @@ Prismatic extracts: colour = SLIME_TYPE_METAL /obj/item/slimecross/prismatic/yellow - paintcolor = "#FFFF00" + paintcolor = COLOR_YELLOW colour = SLIME_TYPE_YELLOW /obj/item/slimecross/prismatic/darkpurple - paintcolor = "#551A8B" + paintcolor = COLOR_DARK_PURPLE colour = SLIME_TYPE_DARK_PURPLE /obj/item/slimecross/prismatic/darkblue - paintcolor = "#0000FF" + paintcolor = COLOR_BLUE colour = SLIME_TYPE_DARK_BLUE /obj/item/slimecross/prismatic/silver @@ -63,7 +63,7 @@ Prismatic extracts: colour = SLIME_TYPE_SILVER /obj/item/slimecross/prismatic/bluespace - paintcolor = "#32CD32" + paintcolor = COLOR_LIME colour = SLIME_TYPE_BLUESPACE /obj/item/slimecross/prismatic/sepia @@ -79,11 +79,11 @@ Prismatic extracts: colour = SLIME_TYPE_PYRITE /obj/item/slimecross/prismatic/red - paintcolor = "#FF0000" + paintcolor = COLOR_RED colour = SLIME_TYPE_RED /obj/item/slimecross/prismatic/green - paintcolor = "#00FF00" + paintcolor = COLOR_VIBRANT_LIME colour = SLIME_TYPE_GREEN /obj/item/slimecross/prismatic/pink @@ -91,7 +91,7 @@ Prismatic extracts: colour = SLIME_TYPE_PINK /obj/item/slimecross/prismatic/gold - paintcolor = "#FFD700" + paintcolor = COLOR_GOLD colour = SLIME_TYPE_GOLD /obj/item/slimecross/prismatic/oil @@ -99,7 +99,7 @@ Prismatic extracts: colour = SLIME_TYPE_OIL /obj/item/slimecross/prismatic/black - paintcolor = "#000000" + paintcolor = COLOR_BLACK colour = SLIME_TYPE_BLACK /obj/item/slimecross/prismatic/lightpink @@ -111,7 +111,7 @@ Prismatic extracts: colour = SLIME_TYPE_ADAMANTINE /obj/item/slimecross/prismatic/rainbow - paintcolor = "#FFFFFF" + paintcolor = COLOR_WHITE colour = SLIME_TYPE_RAINBOW /obj/item/slimecross/prismatic/rainbow/attack_self(mob/user) diff --git a/code/modules/research/xenobiology/crossbreeding/regenerative.dm b/code/modules/research/xenobiology/crossbreeding/regenerative.dm index 4a222e8e982..73e69537a92 100644 --- a/code/modules/research/xenobiology/crossbreeding/regenerative.dm +++ b/code/modules/research/xenobiology/crossbreeding/regenerative.dm @@ -125,7 +125,7 @@ Regenerative extracts: /obj/item/slimecross/regenerative/darkblue/proc/fireproof(obj/item/clothing/C) C.name = "fireproofed [C.name]" C.remove_atom_colour(WASHABLE_COLOUR_PRIORITY) - C.add_atom_colour("#000080", FIXED_COLOUR_PRIORITY) + C.add_atom_colour(COLOR_NAVY, FIXED_COLOUR_PRIORITY) C.max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT C.heat_protection = C.body_parts_covered C.resistance_flags |= FIRE_PROOF diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index ea4199e73c9..bba654e43b4 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -924,7 +924,7 @@ to_chat(user, span_notice("You slather the red gunk over the [C], making it faster.")) C.remove_atom_colour(WASHABLE_COLOUR_PRIORITY) - C.add_atom_colour("#FF0000", FIXED_COLOUR_PRIORITY) + C.add_atom_colour(COLOR_RED, FIXED_COLOUR_PRIORITY) qdel(src) /obj/item/slimepotion/speed/attackby_storage_insert(datum/storage, atom/storage_holder, mob/user) @@ -961,7 +961,7 @@ to_chat(user, span_notice("You slather the blue gunk over the [clothing], fireproofing it.")) clothing.name = "fireproofed [clothing.name]" clothing.remove_atom_colour(WASHABLE_COLOUR_PRIORITY) - clothing.add_atom_colour("#000080", FIXED_COLOUR_PRIORITY) + clothing.add_atom_colour(COLOR_NAVY, FIXED_COLOUR_PRIORITY) clothing.max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT clothing.heat_protection = clothing.body_parts_covered clothing.resistance_flags |= FIRE_PROOF diff --git a/code/modules/shuttle/special.dm b/code/modules/shuttle/special.dm index d9240285991..13f3c5fdf30 100644 --- a/code/modules/shuttle/special.dm +++ b/code/modules/shuttle/special.dm @@ -108,7 +108,7 @@ // New sleepers for(var/i in found - sleepers) var/mob/living/L = i - L.add_atom_colour("#800080", TEMPORARY_COLOUR_PRIORITY) + L.add_atom_colour(COLOR_PURPLE, TEMPORARY_COLOUR_PRIORITY) L.visible_message(span_revennotice("A strange purple glow wraps itself around [L] as [L.p_they()] suddenly fall[L.p_s()] unconscious."), span_revendanger("[desc]")) // Don't let them sit suround unconscious forever @@ -122,7 +122,7 @@ // Missing sleepers for(var/i in sleepers - found) var/mob/living/L = i - L.remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, "#800080") + L.remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, COLOR_PURPLE) L.visible_message("The glow from [L] fades \ away.") L.grab_ghost() diff --git a/code/modules/spells/spell_types/self/mutate.dm b/code/modules/spells/spell_types/self/mutate.dm index 4908a37053d..477c7e6723c 100644 --- a/code/modules/spells/spell_types/self/mutate.dm +++ b/code/modules/spells/spell_types/self/mutate.dm @@ -54,7 +54,7 @@ if(HAS_TRAIT(cast_on, TRAIT_USES_SKINTONES) || HAS_TRAIT(cast_on, TRAIT_MUTANT_COLORS)) return // Our caster has a species that doesn't greenify when hulked, so we will do it manually. - cast_on.add_atom_colour("#00FF00", TEMPORARY_COLOUR_PRIORITY) + cast_on.add_atom_colour(COLOR_VIBRANT_LIME, TEMPORARY_COLOUR_PRIORITY) /datum/action/cooldown/spell/apply_mutations/mutate/remove_mutations(mob/living/carbon/human/cast_on) if(QDELETED(cast_on) || !is_valid_target(cast_on)) diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm index 5d70f8d156d..d5855c5433e 100644 --- a/code/modules/surgery/bodyparts/head.dm +++ b/code/modules/surgery/bodyparts/head.dm @@ -38,7 +38,7 @@ /// Hair style var/hairstyle = "Bald" /// Hair colour and style - var/hair_color = "#000000" + var/hair_color = COLOR_BLACK /// Hair alpha var/hair_alpha = 255 /// Is the hair currently hidden by something? @@ -47,7 +47,7 @@ ///Facial hair style var/facial_hairstyle = "Shaved" ///Facial hair color - var/facial_hair_color = "#000000" + var/facial_hair_color = COLOR_BLACK ///Facial hair alpha var/facial_hair_alpha = 255 ///Is the facial hair currently hidden by something? diff --git a/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm b/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm index 67a02e71d7e..0e004ab3c5c 100644 --- a/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm +++ b/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm @@ -5,7 +5,7 @@ visual = FALSE organ_flags = ORGAN_ROBOTIC failing_desc = "seems to be broken." - var/implant_color = "#FFFFFF" + var/implant_color = COLOR_WHITE var/implant_overlay /obj/item/organ/internal/cyberimp/New(mob/implanted_mob = null) @@ -101,7 +101,7 @@ /obj/item/organ/internal/cyberimp/brain/anti_stun name = "CNS Rebooter implant" desc = "This implant will automatically give you back control over your central nervous system, reducing downtime when stunned." - implant_color = "#FFFF00" + implant_color = COLOR_YELLOW slot = ORGAN_SLOT_BRAIN_ANTISTUN var/static/list/signalCache = list( diff --git a/code/modules/unit_tests/changeling.dm b/code/modules/unit_tests/changeling.dm index b13a0d5434d..420f47c0fb6 100644 --- a/code/modules/unit_tests/changeling.dm +++ b/code/modules/unit_tests/changeling.dm @@ -82,8 +82,8 @@ ling.dna.mutant_bodyparts["spines"] = list(MUTANT_INDEX_NAME = "Long + Membrane", MUTANT_INDEX_COLOR_LIST = list("#886600", "#886600", "#886600")) // NOVA EDIT CHANGE - ORIGINAL: ling.dna.features["spines"] = "Long + Membrane" ling.dna.body_markings["chest"] = list("Light Belly" = list("#886600", 0)) // NOVA EDIT CHANGE - ORIGINAL : ling.dna.features[body_markings] = list("Light Belly") ling.dna.features["legs"] = DIGITIGRADE_LEGS - ling.eye_color_left = "#FFFFFF" - ling.eye_color_right = "#FFFFFF" + ling.eye_color_left = COLOR_WHITE + ling.eye_color_right = COLOR_WHITE ling.dna.update_ui_block(DNA_EYE_COLOR_LEFT_BLOCK) ling.dna.update_ui_block(DNA_EYE_COLOR_RIGHT_BLOCK) ling.set_species(/datum/species/lizard) diff --git a/modular_nova/modules/liquids/code/liquid_systems/liquid_effect.dm b/modular_nova/modules/liquids/code/liquid_systems/liquid_effect.dm index 860c6c8c425..aba748354ec 100644 --- a/modular_nova/modules/liquids/code/liquid_systems/liquid_effect.dm +++ b/modular_nova/modules/liquids/code/liquid_systems/liquid_effect.dm @@ -229,7 +229,7 @@ if(!has_top) return - . += make_liquid_overlay("stage[state]_top", GATEWAY_UNDERLAY_LAYER, GAME_PLANE) + . += make_liquid_overlay("stage[state]_top", TABLE_LAYER + 0.05 , GAME_PLANE) /obj/effect/abstract/liquid_turf/proc/set_new_liquid_state(new_state) liquid_state = new_state diff --git a/tgstation.dme b/tgstation.dme index 7f38628f1dc..ad54d84475f 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -93,7 +93,6 @@ #include "code\__DEFINES\fantasy_affixes.dm" #include "code\__DEFINES\firealarm.dm" #include "code\__DEFINES\fish.dm" -#include "code\__DEFINES\flora.dm" #include "code\__DEFINES\font_awesome_icons.dm" #include "code\__DEFINES\fonts.dm" #include "code\__DEFINES\food.dm"