Revert "Ports tgstation's Color Standardization, adds Color Defines and Signals"

This commit is contained in:
Dahlular
2022-07-06 17:15:00 -06:00
committed by GitHub
parent c6d12d52e1
commit 0cc2229789
188 changed files with 652 additions and 715 deletions
@@ -51,15 +51,15 @@ To add a crossbreed:
if("metal")
itemcolor = "#7E7E7E"
if("yellow")
itemcolor = COLOR_YELLOW
itemcolor = "#FFFF00"
if("dark purple")
itemcolor = "#551A8B"
if("dark blue")
itemcolor = COLOR_BLUE
itemcolor = "#0000FF"
if("silver")
itemcolor = "#D3D3D3"
if("bluespace")
itemcolor = COLOR_LIME
itemcolor = "#32CD32"
if("sepia")
itemcolor = "#704214"
if("cerulean")
@@ -67,9 +67,9 @@ To add a crossbreed:
if("pyrite")
itemcolor = "#FAFAD2"
if("red")
itemcolor = COLOR_RED
itemcolor = "#FF0000"
if("green")
itemcolor = COLOR_GREEN
itemcolor = "#00FF00"
if("pink")
itemcolor = "#FF69B4"
if("gold")
@@ -77,7 +77,7 @@ To add a crossbreed:
if("oil")
itemcolor = "#505050"
if("black")
itemcolor = COLOR_BLACK
itemcolor = "#000000"
if("light pink")
itemcolor = "#FFB6C1"
if("adamantine")
@@ -113,7 +113,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 = COLOR_RED
color = "#FF0000"
list_reagents = list(/datum/reagent/blood = 50)
/obj/item/slimecrossbeaker/pax //5u synthpax.
@@ -125,7 +125,7 @@ To add a crossbreed:
/obj/item/slimecrossbeaker/omnizine //15u omnizine.
name = "healing extract"
desc = "A gelatinous extract of pure omnizine."
color = COLOR_MAGENTA
color = "#FF00FF"
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.
@@ -159,7 +159,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 = COLOR_MAGENTA
color = "#FF00FF"
list_reagents = list(/datum/reagent/medicine/regen_jelly = 20)
/obj/item/slimecrossbeaker/autoinjector/slimejelly //Primarily for slimepeople, but you do you.
@@ -167,7 +167,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 = COLOR_GREEN
color = "#00FF00"
list_reagents = list(/datum/reagent/toxin/slimejelly = 50)
/obj/item/slimecrossbeaker/autoinjector/peaceandlove
@@ -183,5 +183,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 = COLOR_MAGENTA
color = "#FF00FF"
list_reagents = list(/datum/reagent/medicine/regen_jelly = 30, /datum/reagent/drug/methamphetamine = 9)
@@ -502,7 +502,7 @@ datum/status_effect/rebreathing/tick()
is_healing = TRUE
if(is_healing)
examine_text = "<span class='warning'>SUBJECTPRONOUN is regenerating slowly, purplish goo filling in small injuries!</span>"
new /obj/effect/temp_visual/heal(get_turf(owner), COLOR_RED)
new /obj/effect/temp_visual/heal(get_turf(owner), "#FF0000")
else
examine_text = null
..()
@@ -329,7 +329,7 @@ Charged extracts:
to_chat(user, "<span class='notice'>You slather the blue gunk over the [C], making it airtight.</span>")
C.name = "pressure-resistant [C.name]"
C.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
C.add_atom_colour(COLOR_NAVY, FIXED_COLOUR_PRIORITY)
C.add_atom_colour("#000080", FIXED_COLOUR_PRIORITY)
C.min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
C.cold_protection = C.body_parts_covered
C.clothing_flags |= STOPSPRESSUREDAMAGE
@@ -363,7 +363,7 @@ Charged extracts:
to_chat(user, "<span class='notice'>You slather the red gunk over the [C], making it lavaproof.</span>")
C.name = "lavaproof [C.name]"
C.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
C.add_atom_colour(COLOR_RED, FIXED_COLOUR_PRIORITY)
C.add_atom_colour("#800000", FIXED_COLOUR_PRIORITY)
C.resistance_flags |= LAVA_PROOF
if (istype(C, /obj/item/clothing))
var/obj/item/clothing/CL = C
@@ -283,25 +283,25 @@ Consuming extracts:
switch(rand(1,7))
if(1)
tastemessage = "red dye"
colour = COLOR_RED
colour = "#FF0000"
if(2)
tastemessage = "orange dye"
colour = "#FFA500"
if(3)
tastemessage = "yellow dye"
colour = COLOR_YELLOW
colour = "#FFFF00"
if(4)
tastemessage = "green dye"
colour = COLOR_GREEN
colour = "#00FF00"
if(5)
tastemessage = "blue dye"
colour = COLOR_BLUE
colour = "#0000FF"
if(6)
tastemessage = "indigo dye"
colour = "#4B0082"
if(7)
tastemessage = "violet dye"
colour = COLOR_MAGENTA
colour = "#FF00FF"
taste += tastemessage
/obj/item/slime_cookie/pyrite/do_effect(mob/living/M, mob/user)
@@ -46,7 +46,7 @@ Prismatic extracts:
colour = "metal"
/obj/item/slimecross/prismatic/yellow
paintcolor = COLOR_YELLOW
paintcolor = "#FFFF00"
colour = "yellow"
/obj/item/slimecross/prismatic/darkpurple
@@ -54,7 +54,7 @@ Prismatic extracts:
colour = "dark purple"
/obj/item/slimecross/prismatic/darkblue
paintcolor = COLOR_BLUE
paintcolor = "#0000FF"
colour = "dark blue"
/obj/item/slimecross/prismatic/silver
@@ -62,7 +62,7 @@ Prismatic extracts:
colour = "silver"
/obj/item/slimecross/prismatic/bluespace
paintcolor = COLOR_LIME
paintcolor = "#32CD32"
colour = "bluespace"
/obj/item/slimecross/prismatic/sepia
@@ -78,11 +78,11 @@ Prismatic extracts:
colour = "pyrite"
/obj/item/slimecross/prismatic/red
paintcolor = COLOR_RED
paintcolor = "#FF0000"
colour = "red"
/obj/item/slimecross/prismatic/green
paintcolor = COLOR_GREEN
paintcolor = "#00FF00"
colour = "green"
/obj/item/slimecross/prismatic/pink
@@ -98,7 +98,7 @@ Prismatic extracts:
colour = "oil"
/obj/item/slimecross/prismatic/black
paintcolor = COLOR_BLACK
paintcolor = "#000000"
colour = "black"
/obj/item/slimecross/prismatic/lightpink
@@ -119,7 +119,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(COLOR_NAVY, FIXED_COLOUR_PRIORITY)
C.add_atom_colour("#000080", 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
@@ -861,7 +861,7 @@
to_chat(user, "<span class='notice'>You slather the red gunk over the [C], making it faster.</span>")
C.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
C.add_atom_colour(COLOR_RED, FIXED_COLOUR_PRIORITY)
C.add_atom_colour("#FF0000", FIXED_COLOUR_PRIORITY)
qdel(src)
/obj/item/slimepotion/fireproof
@@ -885,7 +885,7 @@
to_chat(user, "<span class='notice'>You slather the blue gunk over the [C], fireproofing it.</span>")
C.name = "fireproofed [C.name]"
C.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
C.add_atom_colour(COLOR_NAVY, FIXED_COLOUR_PRIORITY)
C.add_atom_colour("#000080", 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