Skip to content

Commit

Permalink
clean up change more stuff take into account non maj
Browse files Browse the repository at this point in the history
way of naming stuff...
  • Loading branch information
Julien committed Jan 10, 2024
1 parent fe2ce73 commit 0eb37ed
Show file tree
Hide file tree
Showing 9 changed files with 51 additions and 54 deletions.
29 changes: 13 additions & 16 deletions code/__DEFINES/colours.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,39 +14,36 @@

// BLACK AND WHITE COLOR DEFINE.

/// Full white. rgb(255, 255, 255)
/// White rgb(255, 255, 255)
#define COLOR_WHITE "#FFFFFF"
/// Full black. rgb(0, 0, 0)
/// Black rgb(0, 0, 0)
#define COLOR_BLACK "#000000"

// THE THREE PRIMARIES COLORS DEFINES.

/// Full red. rgb(255, 0, 0)
/// Red rgb(255, 0, 0)
#define COLOR_RED "#FF0000"
/// Full green. rgb(0, 255, 0)
/// Green rgb(0, 255, 0)
#define COLOR_GREEN "#00FF00"
/// Full blue. rgb(0, 0, 255)
/// Blue rgb(0, 0, 255)
#define COLOR_BLUE "#0000FF"

//mix of two full primary colors

/// full cyan rgb(0, 255, 255) B + G
/// Cyan rgb(0, 255, 255) B + G
#define COLOR_CYAN "#00FFFF"
/// full magenta(not pink) rgb(255, 0, 255) R+B
/// Magenta rgb(255, 0, 255) R+B
#define COLOR_MAGENTA "#FF00FF"
/// full yellow rgb(255, 255, 0) R+G
/// Yellow rgb(255, 255, 0) R+G
#define COLOR_YELLOW "#FFFF00"

// colors define in use bellow


//color define with a proper name

///Olive rgb(128, 128, 0)
/// Olive rgb(128, 128, 0)
#define COLOR_OLIVE "#808000"
///Silver rgb(192, 192, 192) shade of grey
/// Silver rgb(192, 192, 192) shade of grey
#define COLOR_SILVER "#C0C0C0"
///Gray rgb(128, 128, 128)
/// Gray rgb(128, 128, 128)
#define COLOR_GRAY "#808080"

#define COLOR_FLOORTILE_GRAY "#8D8B8B"
Expand All @@ -55,7 +52,7 @@

#define COLOR_DARK_RED "#A50824"

///Maroon rgb(128, 0, 0) shade of red
/// Maroon rgb(128, 0, 0) shade of red
#define COLOR_MAROON "#800000"

#define COLOR_VIVID_RED "#FF3232"
Expand All @@ -71,7 +68,7 @@
#define COLOR_TEAL "#008080"

#define COLOR_MODERATE_BLUE "#555CC2"
///Purple rgb( 128, 0, 128)
/// Purple rgb( 128, 0, 128)
#define COLOR_PURPLE "#800080"
#define COLOR_STRONG_VIOLET "#6927c5"

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/effects/decals/cleanable/blood/robots.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7")

/obj/effect/decal/cleanable/blood/gibs/robot/update_icon()
color = "#FFFFFF"
color = COLOR_WHITE

/obj/effect/decal/cleanable/blood/gibs/robot/dry() //pieces of robots do not dry up like
return
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/effects/decals/crayon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
layer = ABOVE_TURF_LAYER
anchored = TRUE

/obj/effect/decal/cleanable/crayon/New(location, main = "#FFFFFF",shade = "#000000", type = "rune")
/obj/effect/decal/cleanable/crayon/New(location, main = COLOR_WHITE,shade = COLOR_BLACK, type = "rune")
..()
forceMove(location)

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/reagent_containers/food.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
possible_transfer_amounts = null
volume = 50 //Sets the default container amount for all food items.
flags_atom = CAN_BE_SYRINGED
var/filling_color = "#FFFFFF" //Used by sandwiches.
var/filling_color = COLOR_WHITE //Used by sandwiches.

/obj/item/reagent_container/food/Initialize()
. = ..()
Expand Down
10 changes: 5 additions & 5 deletions code/game/objects/items/reagent_containers/food/snacks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@
name = "Boiled egg"
desc = "A hard-boiled egg."
icon_state = "egg"
filling_color = "#FFFFFF"
filling_color = COLOR_WHITE

/obj/item/reagent_container/food/snacks/boiledegg/Initialize()
. = ..()
Expand Down Expand Up @@ -865,7 +865,7 @@
name = "Clown Burger"
desc = "This tastes funny..."
icon_state = "clownburger"
filling_color = "#FF00FF"
filling_color = COLOR_MAGENTA

/obj/item/reagent_container/food/snacks/clownburger/Initialize()
. = ..()
Expand All @@ -881,7 +881,7 @@
name = "Mime Burger"
desc = "Its taste defies language."
icon_state = "mimeburger"
filling_color = "#FFFFFF"
filling_color = COLOR_WHITE

/obj/item/reagent_container/food/snacks/mimeburger/Initialize()
. = ..()
Expand Down Expand Up @@ -1368,7 +1368,7 @@
name = "Tomato soup"
desc = "Smells like copper"
icon_state = "tomatosoup"
filling_color = "#FF0000"
filling_color = COLOR_RED

/obj/item/reagent_container/food/snacks/bloodsoup/Initialize()
. = ..()
Expand Down Expand Up @@ -2128,7 +2128,7 @@
desc = "A tasty dessert that won't make it through a metal detector."
icon_state = "gappletart"
trash = /obj/item/trash/plate
filling_color = "#FFFF00"
filling_color = COLOR_YELLOW

/obj/item/reagent_container/food/snacks/appletart/Initialize()
. = ..()
Expand Down
12 changes: 6 additions & 6 deletions code/game/objects/items/reagent_containers/food/snacks/grown.dm
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
name = "cherries"
desc = "Great for toppings!"
icon_state = "cherry"
filling_color = "#FF0000"
filling_color = COLOR_RED
gender = PLURAL
plantname = "cherry"

Expand Down Expand Up @@ -357,7 +357,7 @@
name = "chili"
desc = "It's spicy! Wait... IT'S BURNING ME!!"
icon_state = "chilipepper"
filling_color = "#FF0000"
filling_color = COLOR_RED
plantname = "chili"

/obj/item/reagent_container/food/snacks/grown/eggplant
Expand All @@ -379,7 +379,7 @@
name = "tomato"
desc = "I say to-mah-to, you say tom-mae-to."
icon_state = "tomato"
filling_color = "#FF0000"
filling_color = COLOR_RED
potency = 10
plantname = "tomato"

Expand All @@ -395,7 +395,7 @@
desc = "I say to-mah-to, you say tom-mae-to... OH GOD IT'S EATING MY LEGS!!"
icon_state = "killertomato"
potency = 10
filling_color = "#FF0000"
filling_color = COLOR_RED
potency = 30
plantname = "killertomato"

Expand All @@ -414,7 +414,7 @@
desc = "So bloody...so...very...bloody....AHHHH!!!!"
icon_state = "bloodtomato"
potency = 10
filling_color = "#FF0000"
filling_color = COLOR_RED
plantname = "bloodtomato"

/obj/item/reagent_container/food/snacks/grown/bloodtomato/launch_impact(atom/hit_atom)
Expand Down Expand Up @@ -502,7 +502,7 @@
desc = "<I>Amanita Muscaria</I>: Learn poisonous mushrooms by heart. Only pick mushrooms you know."
icon_state = "amanita"
potency = 10
filling_color = "#FF0000"
filling_color = COLOR_RED
plantname = "amanita"

/obj/item/reagent_container/food/snacks/grown/mushroom/angel
Expand Down
14 changes: 7 additions & 7 deletions code/game/objects/items/toys/crayons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,21 @@
/obj/item/toy/crayon/mime
icon_state = "crayonmime"
desc = "A very sad-looking crayon."
crayon_color = "#FFFFFF"
shadeColour = "#000000"
crayon_color = COLOR_WHITE
shadeColour = COLOR_BLACK
colourName = "mime"
uses = 0

/obj/item/toy/crayon/mime/attack_self(mob/living/user) //inversion
..()

if(crayon_color != "#FFFFFF" && shadeColour != "#000000")
crayon_color = "#FFFFFF"
shadeColour = "#000000"
if(crayon_color != COLOR_WHITE && shadeColour != COLOR_BLACK)
crayon_color = COLOR_WHITE
shadeColour = COLOR_BLACK
to_chat(user, "You will now draw in white and black with this crayon.")
else
crayon_color = "#000000"
shadeColour = "#FFFFFF"
crayon_color = COLOR_BLACK
shadeColour = COLOR_WHITE
to_chat(user, "You will now draw in black and white with this crayon.")

/obj/item/toy/crayon/rainbow
Expand Down
26 changes: 13 additions & 13 deletions code/modules/cm_tech/tech_tiers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

var/flags = NO_FLAGS

var/disabled_color = "#FFFFFF"
var/color = "#FFFFFF"
var/disabled_color = COLOR_WHITE
var/color = COLOR_WHITE
var/max_techs = INFINITE_TECHS // Infinite

var/list/turf/tier_turfs
Expand All @@ -19,22 +19,22 @@
/datum/tier/free
name = "Initial Tier"
tier = 0
color = "#000000"
disabled_color = "#000000"
color = COLOR_BLACK
disabled_color = COLOR_BLACK

flags = TIER_FLAG_TRANSITORY

/datum/tier/one
name = "Tier 1"
tier = 1
color = "#00FF00"
color = COLOR_GREEN
disabled_color = "#007d00"

/datum/tier/one_transition_two
name = "Tier 1 to Tier 2 transition"
tier = 1
color = "#000000"
disabled_color = "#000000"
color = COLOR_BLACK
disabled_color = COLOR_BLACK

flags = TIER_FLAG_TRANSITORY
/datum/tier/two
Expand All @@ -47,27 +47,27 @@
/datum/tier/two_transition_three
name = "Tier 2 to Tier 3 transition"
tier = 2
color = "#000000"
disabled_color = "#000000"
color = COLOR_BLACK
disabled_color = COLOR_BLACK

flags = TIER_FLAG_TRANSITORY
/datum/tier/three
name = "Tier 3"
tier = 3
color = "#FF0000"
color = COLOR_RED
disabled_color = "#7d0000"

/datum/tier/three_transition_four
name = "Tier 3 to Tier 4 transition"
tier = 3
color = "#000000"
disabled_color = "#000000"
color = COLOR_BLACK
disabled_color = COLOR_BLACK

flags = TIER_FLAG_TRANSITORY
/datum/tier/four
name = "Tier 4"
tier = 4
color = "#FF00FF"
color = COLOR_MAGENTA
disabled_color = "#7d007d"

max_techs = 1
8 changes: 4 additions & 4 deletions code/modules/reagents/chemistry_reagents/other.dm
Original file line number Diff line number Diff line change
Expand Up @@ -720,8 +720,8 @@
id = "napalmgel"
description = "Unlike its liquid contemporaries, this gelled variant of napalm is easily extinguished, but shoots far and lingers on the ground in a viscous mess, while reacting with inorganic materials to ignite them."
flameshape = FLAMESHAPE_LINE
color = "#00ff00"
burncolor = "#00ff00"
color = COLOR_GREEN
burncolor = COLOR_GREEN
burn_sprite = "green"
properties = list(
PROPERTY_INTENSITY = BURN_LEVEL_TIER_2,
Expand Down Expand Up @@ -750,8 +750,8 @@
id = "napalmb"
description = "A special variant of napalm that's unable to cling well to anything, but disperses over a wide area while burning slowly. The composition reacts with inorganic materials to ignite them, causing severe damage."
flameshape = FLAMESHAPE_TRIANGLE
color = "#00ff00"
burncolor = "#00ff00"
color = COLOR_GREEN
burncolor = COLOR_GREEN
burn_sprite = "green"
properties = list(
PROPERTY_INTENSITY = BURN_LEVEL_TIER_2,
Expand Down

0 comments on commit 0eb37ed

Please sign in to comment.