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
+2 -2
View File
@@ -44,7 +44,7 @@ GLOBAL_LIST_EMPTY(PDAs)
var/current_overlays = PDA_STANDARD_OVERLAYS
var/font_index = 0 //This int tells DM which font is currently selected and lets DM know when the last font has been selected so that it can cycle back to the first font when "toggle font" is pressed again.
var/font_mode = "font-family:monospace;" //The currently selected font.
var/background_color = COLOR_OLIVE //The currently selected background color.
var/background_color = "#808000" //The currently selected background color.
#define FONT_MONO "font-family:monospace;"
#define FONT_SHARE "font-family:\"Share Tech Mono\", monospace;letter-spacing:0px;"
@@ -60,7 +60,7 @@ GLOBAL_LIST_EMPTY(PDAs)
var/fon = FALSE //Is the flashlight function on?
var/f_lum = 2.3 //Luminosity for the flashlight function
var/f_pow = 0.6 //Power for the flashlight function
var/f_col = COLOR_CREAMY_ORANGE //Color for the flashlight function
var/f_col = "#FFCC66" //Color for the flashlight function
var/silent = FALSE //To beep or not to beep, that is the question
var/toff = FALSE //If TRUE, messenger disabled
var/tnote = null //Current Texts
+12 -11
View File
@@ -11,10 +11,10 @@
slot_flags = ITEM_SLOT_BELT
materials = list(MAT_METAL=50, MAT_GLASS=20)
actions_types = list(/datum/action/item_action/toggle_light)
light_color = COLOR_CREAMY_ORANGE
var/on = FALSE
var/brightness_on = 4 //range of light when on
var/flashlight_power = 0.8 //strength of the light when on
light_color = "#FFCC66"
/obj/item/flashlight/Initialize()
. = ..()
@@ -26,10 +26,9 @@
if(on)
icon_state = "[initial(icon_state)]-on"
if(flashlight_power)
set_light_range(brightness_on)
set_light_power(flashlight_power)
set_light(l_range = brightness_on, l_power = flashlight_power)
else
set_light_range(brightness_on)
set_light(brightness_on)
else
icon_state = initial(icon_state)
set_light(0)
@@ -259,15 +258,16 @@
desc = "A red Kinaris issued flare. There are instructions on the side, it reads 'pull cord, make light'."
w_class = WEIGHT_CLASS_SMALL
brightness_on = 7 // Pretty bright.
light_color = "#FA421A"
icon_state = "flare"
item_state = "flare"
actions_types = list()
heat = 1000
light_color = LIGHT_COLOR_FLARE
grind_results = list(/datum/reagent/sulfur = 15)
var/fuel = 0
var/on_damage = 7
var/produce_heat = 1500
heat = 1000
light_color = LIGHT_COLOR_FLARE
grind_results = list(/datum/reagent/sulfur = 15)
/obj/item/flashlight/flare/New()
fuel = rand(800, 1000) // Sorry for changing this so much but I keep under-estimating how long X number of ticks last in seconds.
@@ -332,13 +332,14 @@
desc = "A torch fashioned from some leaves and a log."
w_class = WEIGHT_CLASS_BULKY
brightness_on = 4
light_color = "#FAA44B"
icon_state = "torch"
item_state = "torch"
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
righthand_file = 'icons/mob/inhands/items_righthand.dmi'
light_color = LIGHT_COLOR_ORANGE
on_damage = 10
slot_flags = null
light_color = LIGHT_COLOR_FIRE
/obj/item/flashlight/lantern
name = "lantern"
@@ -348,8 +349,8 @@
righthand_file = 'icons/mob/inhands/equipment/mining_righthand.dmi'
desc = "A mining lantern."
brightness_on = 6 // luminosity when on
light_color = "#FFAA44"
flashlight_power = 0.75
light_color = LIGHT_COLOR_FIRE
/obj/item/flashlight/slime
@@ -490,7 +491,7 @@
/obj/item/flashlight/glowstick/red
name = "red glowstick"
color = COLOR_SOFT_RED
color = LIGHT_COLOR_RED
/obj/item/flashlight/glowstick/blue
name = "blue glowstick"
@@ -516,7 +517,7 @@
name = "disco light"
desc = "Groovy..."
icon_state = null
light_color = COLOR_WHITE
light_color = null
brightness_on = 0
flashlight_power = 1
light_range = 0
@@ -112,7 +112,7 @@
playsound(src, 'sound/effects/splat.ogg', 50, TRUE, frequency = 0.5)
jill.apply_damage(9999, BRUTE, BODY_ZONE_HEAD)
jill.death() //just in case, for some reason, they're still alive
flash_color(jill, flash_color = COLOR_RED, flash_time = 100)
flash_color(jill, flash_color = "#FF0000", flash_time = 100)
/obj/item/reverse_bear_trap/proc/reset()
ticking = FALSE