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
+1 -1
View File
@@ -14,7 +14,7 @@
announceWhen = 30
startWhen = 1
endWhen = 115
var/list/aurora_colors = list("#ffc8bc", "#ed927f", "#d5745f", "#bf3a1d", "#c71414", "#FF3131", "#ee0808", COLOR_RED)
var/list/aurora_colors = list("#ffc8bc", "#ed927f", "#d5745f", "#bf3a1d", "#c71414", "#FF3131", "#ee0808", "#ff0000")
var/aurora_progress = 0 //this cycles from 1 to 8, slowly grading towards a bright red
var/list/areasToFlicker = list(/area/hallway,
/area/security,
+1 -1
View File
@@ -15,7 +15,7 @@
announceWhen = 1
startWhen = 8 //Delayed with sleep()
endWhen = 50
var/list/aurora_colors = list("#ffd980", "#eaff80", "#eaff80", "#ffd980", "#eaff80", "#A2FFC7", "#9400D3", COLOR_PINK)
var/list/aurora_colors = list("#ffd980", "#eaff80", "#eaff80", "#ffd980", "#eaff80", "#A2FFC7", "#9400D3", "#FFC0CB")
var/aurora_progress = 0 //this cycles from 1 to 8, slowly changing colors from gentle green to gentle blue
var/list/applicable_areas = list()
+1 -1
View File
@@ -178,7 +178,7 @@
shuttleId = "pirateship"
icon_screen = "syndishuttle"
icon_keyboard = "syndie_key"
light_color = COLOR_SOFT_RED
light_color = LIGHT_COLOR_RED
possible_destinations = "pirateship_away;pirateship_home;pirateship_custom"
/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate
+1 -1
View File
@@ -64,7 +64,7 @@
/datum/round_event/portal_storm/setup()
storm = mutable_appearance('icons/obj/tesla_engine/energy_ball.dmi', "energy_ball_fast", FLY_LAYER)
storm.color = COLOR_GREEN
storm.color = "#00FF00"
number_of_bosses = 0
for(var/boss in boss_types)
+4 -4
View File
@@ -74,7 +74,7 @@
/datum/spacevine_mutation/light
name = "light"
hue = COLOR_YELLOW
hue = "#ffff00"
quality = POSITIVE
severity = 4
@@ -84,7 +84,7 @@
/datum/spacevine_mutation/toxicity
name = "toxic"
hue = COLOR_MAGENTA
hue = "#ff00ff"
severity = 10
quality = NEGATIVE
@@ -101,7 +101,7 @@
/datum/spacevine_mutation/explosive //OH SHIT IT CAN CHAINREACT RUN!!!
name = "explosive"
hue = COLOR_RED
hue = "#ff0000"
quality = NEGATIVE
severity = 2
@@ -192,7 +192,7 @@
/datum/spacevine_mutation/carbondioxide_eater
name = "CO2 consuming"
hue = COLOR_CYAN
hue = "#00ffff"
severity = 3
quality = POSITIVE
+4 -4
View File
@@ -47,14 +47,14 @@
last_holder = user
if(!(user in color_altered_mobs))
color_altered_mobs += user
user.add_atom_colour(COLOR_GREEN, ADMIN_COLOUR_PRIORITY)
user.add_atom_colour("#00FF00", ADMIN_COLOUR_PRIORITY)
START_PROCESSING(SSobj, src)
..()
/obj/item/greentext/dropped(mob/living/user as mob)
if(user in color_altered_mobs)
to_chat(user, "<span class='warning'>A sudden wave of failure washes over you...</span>")
user.add_atom_colour(COLOR_RED, ADMIN_COLOUR_PRIORITY) //ya blew it
user.add_atom_colour("#FF0000", ADMIN_COLOUR_PRIORITY) //ya blew it
last_holder = null
new_holder = null
STOP_PROCESSING(SSobj, src)
@@ -75,7 +75,7 @@
/obj/item/greentext/process()
if(last_holder && last_holder != new_holder) //Somehow it was swiped without ever getting dropped
to_chat(last_holder, "<span class='warning'>A sudden wave of failure washes over you...</span>")
last_holder.add_atom_colour(COLOR_RED, ADMIN_COLOUR_PRIORITY)
last_holder.add_atom_colour("#FF0000", ADMIN_COLOUR_PRIORITY)
last_holder = new_holder //long live the king
/obj/item/greentext/Destroy(force)
@@ -89,7 +89,7 @@
var/message = "<span class='warning'>A dark temptation has passed from this world"
if(M in color_altered_mobs)
message += " and you're finally able to forgive yourself"
if(M.color == COLOR_RED || M.color == COLOR_GREEN)
if(M.color == "#FF0000" || M.color == "#00FF00")
M.remove_atom_colour(ADMIN_COLOUR_PRIORITY)
message += "...</span>"
// can't skip the mob check as it also does the decolouring
+1 -1
View File
@@ -47,7 +47,7 @@
/mob/living/simple_animal/hostile/carp/ranged/chaos
name = "chaos magicarp"
desc = "50% carp, 100% magic, 150% horrible."
color = COLOR_CYAN
color = "#00FFFF"
maxHealth = 75
health = 75