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
@@ -121,7 +121,7 @@
/obj/item/firing_pin/clown
name = "hilarious firing pin"
desc = "Advanced clowntech that can convert any firearm into a far more useful object."
color = COLOR_YELLOW
color = "#FFFF00"
fail_message = "<span class='warning'>HONK!</span>"
force_replace = TRUE
+3 -3
View File
@@ -10,7 +10,7 @@
flag = "laser"
eyeblur = 2
impact_effect_type = /obj/effect/temp_visual/impact_effect/red_laser
light_color = COLOR_SOFT_RED
light_color = LIGHT_COLOR_RED
ricochets_max = 50 //Honk!
ricochet_chance = 80
is_reflectable = TRUE
@@ -143,7 +143,7 @@
icon_state = "laser"
suit_types = list(/obj/item/clothing/suit/bluetag)
impact_effect_type = /obj/effect/temp_visual/impact_effect/red_laser
light_color = COLOR_SOFT_RED
light_color = LIGHT_COLOR_RED
tracer_type = /obj/effect/projectile/tracer/laser
muzzle_type = /obj/effect/projectile/muzzle/laser
impact_type = /obj/effect/projectile/impact/laser
@@ -182,7 +182,7 @@
/obj/item/projectile/beam/instakill/red
icon_state = "red_laser"
impact_effect_type = /obj/effect/temp_visual/impact_effect/red_laser
light_color = COLOR_SOFT_RED
light_color = LIGHT_COLOR_RED
/obj/item/projectile/beam/instakill/on_hit(atom/target)
. = ..()
@@ -24,7 +24,7 @@
jitter = 20
range = 7
icon_state = "spark"
color = COLOR_YELLOW
color = "#FFFF00"
/obj/item/projectile/bullet/shotgun_meteorslug
name = "meteorslug"
@@ -12,7 +12,7 @@
/obj/item/projectile/energy/electrode
name = "electrode"
icon_state = "spark"
color = COLOR_YELLOW
color = "#FFFF00"
nodamage = 1
knockdown = 100
stutter = 5
@@ -9,12 +9,12 @@
hitsound = 'sound/weapons/emitter2.ogg'
impact_type = /obj/effect/projectile/impact/xray
var/static/list/particle_colors = list(
"red" = COLOR_RED,
"blue" = COLOR_GREEN,
"green" = COLOR_BLUE,
"yellow" = COLOR_YELLOW,
"cyan" = COLOR_CYAN,
"purple" = COLOR_MAGENTA
"red" = "#FF0000",
"blue" = "#00FF00",
"green" = "#0000FF",
"yellow" = "#FFFF00",
"cyan" = "#00FFFF",
"purple" = "#FF00FF"
)
/obj/item/projectile/energy/nuclear_particle/Initialize()
@@ -1,7 +1,7 @@
/obj/item/projectile/energy/electrode
name = "electrode"
icon_state = "spark"
color = COLOR_YELLOW
color = "#FFFF00"
nodamage = 1
knockdown = 60
knockdown_stamoverride = 36
@@ -6,7 +6,7 @@
damage = 0
damage_type = BRUTE
nodamage = 1
color = COLOR_BLUE_LIGHT
color = "#33CCFF"
var/turf/T
var/power = 4
var/list/thrown_items = list()
@@ -158,7 +158,7 @@
name = "electrode"
damage_type = BURN
hal_icon_state = "spark"
color = COLOR_YELLOW
color = "#FFFF00"
hal_fire_sound = 'sound/weapons/taser.ogg'
hal_hitsound = 'sound/weapons/taserhit.ogg'
hal_hitsound_wall = null
@@ -6,7 +6,7 @@
nodamage = TRUE
pass_flags = PASSGLASS | PASSTABLE | PASSGRILLE | PASSMOB
var/obj/item/gun/energy/wormhole_projector/gun
color = COLOR_BLUE_LIGHT
color = "#33CCFF"
tracer_type = /obj/effect/projectile/tracer/wormhole
impact_type = /obj/effect/projectile/impact/wormhole
muzzle_type = /obj/effect/projectile/muzzle/wormhole