Merge pull request #1629 from DragonTrance/more-colors

Ports tgstation's Color Standardization, adds Color Defines and Signals
This commit is contained in:
Dahlular
2022-07-06 15:44:41 -06:00
committed by GitHub
188 changed files with 715 additions and 652 deletions
@@ -25,7 +25,7 @@
icon = 'hyperstation/icons/obj/hydroponics/harvest.dmi'
icon_state = "kalynaberries"
gender = PLURAL
filling_color = "#FF0000"
filling_color = COLOR_RED
bitesize_mod = 2
foodtype = FRUIT
juice_results = list(/datum/reagent/consumable/kalynajuice = 1)
@@ -436,9 +436,7 @@ The reactor CHEWS through moderator. It does not do this slowly. Be very careful
if(!alert) //Congrats! You stopped the meltdown / blowout.
stop_relay(CHANNEL_REACTOR_ALERT)
warning = FALSE
set_light(0)
light_color = LIGHT_COLOR_CYAN
set_light(10)
set_light(l_range=10, l_color=LIGHT_COLOR_CYAN)
else
if(!alert)
return
@@ -447,9 +445,7 @@ The reactor CHEWS through moderator. It does not do this slowly. Be very careful
next_warning = world.time + 30 SECONDS //To avoid engis pissing people off when reaaaally trying to stop the meltdown or whatever.
warning = TRUE //Start warning the crew of the imminent danger.
relay('hyperstation/sound/effects/rbmk/alarm.ogg', null, loop=TRUE, channel = CHANNEL_REACTOR_ALERT)
set_light(0)
light_color = LIGHT_COLOR_RED
set_light(10)
set_light(l_range=10, l_color=COLOR_SOFT_RED)
//Failure condition 1: Meltdown. Achieved by having heat go over tolerances. This is less devastating because it's easier to achieve.
//Results: Engineering becomes unusable and your engine irreparable
+1 -1
View File
@@ -17,7 +17,7 @@
var/user = ""
light_power = 0
light_range = 7
light_color = "#ff3232"
light_color = COLOR_VIVID_RED
var/pin = 0
/obj/machinery/atm/ui_interact(mob/user)
+1 -1
View File
@@ -168,7 +168,7 @@
icon_state = null
item_state = null
w_class = WEIGHT_CLASS_NORMAL
light_color = "#FFCC66"
light_color = COLOR_CREAMY_ORANGE
icon_off = "pipe"
icon_on = "pipe_lit"