cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-10 18:11:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Red and green energy swords have much less saturated light colors (#25118)

Browse Source
This commit is contained in:
Joan Lung
2017-03-16 03:25:51 -04:00
committed by oranges
parent ca32b8efba
commit 0cf2e02bb6
3 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/__DEFINES/lighting.dm
View File

@@ -58,9 +58,13 @@
#define LIGHT_COLOR_ORANGE "#FA9632" //Mostly pure orange. rgb(250, 150, 50) #define LIGHT_COLOR_ORANGE "#FA9632" //Mostly pure orange. rgb(250, 150, 50)
#define LIGHT_COLOR_PURPLE "#952CF4" //Light Purple. rgb(149, 44, 244) #define LIGHT_COLOR_PURPLE "#952CF4" //Light Purple. rgb(149, 44, 244)
#define LIGHT_COLOR_LIGHT_CYAN "#40CEFF" //More-saturated cyan. rgb(64, 206, 255)
#define LIGHT_COLOR_LAVENDER "#9B51FF" //Less-saturated light purple. rgb(155, 81, 255)
//These ones aren't a direct colour like the ones above, because nothing would fit //These ones aren't a direct colour like the ones above, because nothing would fit
#define LIGHT_COLOR_FIRE "#FAA019" //Warm orange color, leaning strongly towards yellow. rgb(250, 160, 25) #define LIGHT_COLOR_FIRE "#FAA019" //Warm orange color, leaning strongly towards yellow. rgb(250, 160, 25)
#define LIGHT_COLOR_FLARE "#FA644B" //Bright, non-saturated red. Leaning slightly towards pink for visibility. rgb(250, 100, 75) #define LIGHT_COLOR_FLARE "#FA644B" //Bright, non-saturated red. Leaning slightly towards pink for visibility. rgb(250, 100, 75)
#define LIGHT_COLOR_SLIME_LAMP "#AFC84B" //Weird color, between yellow and green, very slimy. rgb(175, 200, 75) #define LIGHT_COLOR_SLIME_LAMP "#AFC84B" //Weird color, between yellow and green, very slimy. rgb(175, 200, 75)
#define LIGHT_COLOR_TUNGSTEN "#FAE1AF" //Extremely diluted yellow, close to skin color (for some reason). rgb(250, 225, 175) #define LIGHT_COLOR_TUNGSTEN "#FAE1AF" //Extremely diluted yellow, close to skin color (for some reason). rgb(250, 225, 175)
#define LIGHT_COLOR_HALOGEN "#F0FAFA" //Barely visible cyan-ish hue, as the doctor prescribed. rgb(240, 250, 250) #define LIGHT_COLOR_HALOGEN "#F0FAFA" //Barely visible cyan-ish hue, as the doctor prescribed. rgb(240, 250, 250)

12
code/game/objects/items/weapons/melee/energy.dm
View File

@@ -21,13 +21,13 @@
item_color = pick(possible_colors) item_color = pick(possible_colors)
switch(item_color)//Only run this check if the color was picked randomly, so that colors can be manually set for non-random colored energy weapons. switch(item_color)//Only run this check if the color was picked randomly, so that colors can be manually set for non-random colored energy weapons.
if("red") if("red")
light_color = "#ff0000" light_color = LIGHT_COLOR_RED
if("green") if("green")
light_color = "#00ff00" light_color = LIGHT_COLOR_GREEN
if("blue") if("blue")
light_color = "#40ceff" light_color = LIGHT_COLOR_LIGHT_CYAN
if("purple") if("purple")
light_color = "#9b51ff" light_color = LIGHT_COLOR_LAVENDER
if(active) if(active)
set_light(brightness_on) set_light(brightness_on)
@@ -88,9 +88,9 @@
. = ..() . = ..()
/obj/item/weapon/melee/energy/sword/process() /obj/item/weapon/melee/energy/sword/process()
if(hacked)
light_color = pick("#ff0000", "#00ff00", "#40ceff", "#9b51ff")
if(active) if(active)
if(hacked)
light_color = pick(LIGHT_COLOR_RED, LIGHT_COLOR_GREEN, LIGHT_COLOR_LIGHT_CYAN, LIGHT_COLOR_LAVENDER)
open_flame() open_flame()
else else
STOP_PROCESSING(SSobj, src) STOP_PROCESSING(SSobj, src)

14
code/game/objects/items/weapons/twohanded.dm
View File

@@ -269,13 +269,13 @@
item_color = pick(possible_colors) item_color = pick(possible_colors)
switch(item_color) switch(item_color)
if("red") if("red")
light_color = "#ff0000" light_color = LIGHT_COLOR_RED
if("green") if("green")
light_color = "#00ff00" light_color = LIGHT_COLOR_GREEN
if("blue") if("blue")
light_color = "#40ceff" light_color = LIGHT_COLOR_LIGHT_CYAN
if("purple") if("purple")
light_color = "#9b51ff" light_color = LIGHT_COLOR_LAVENDER
/obj/item/weapon/twohanded/dualsaber/Destroy() /obj/item/weapon/twohanded/dualsaber/Destroy()
STOP_PROCESSING(SSobj, src) STOP_PROCESSING(SSobj, src)
@@ -302,9 +302,9 @@
INVOKE_ASYNC(src, .proc/jedi_spin, user) INVOKE_ASYNC(src, .proc/jedi_spin, user)
/obj/item/weapon/twohanded/dualsaber/proc/jedi_spin(mob/living/user) /obj/item/weapon/twohanded/dualsaber/proc/jedi_spin(mob/living/user)
for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2)) for(var/i in list(NORTH,SOUTH,EAST,WEST,EAST,SOUTH,NORTH,SOUTH,EAST,WEST,EAST,SOUTH))
user.setDir(i) user.setDir(i)
if(i == 8) if(i == WEST)
user.emote("flip") user.emote("flip")
sleep(1) sleep(1)
@@ -349,7 +349,7 @@
/obj/item/weapon/twohanded/dualsaber/process() /obj/item/weapon/twohanded/dualsaber/process()
if(wielded) if(wielded)
if(hacked) if(hacked)
light_color = pick("#ff0000", "#00ff00", "#40ceff", "#9b51ff") light_color = pick(LIGHT_COLOR_RED, LIGHT_COLOR_GREEN, LIGHT_COLOR_LIGHT_CYAN, LIGHT_COLOR_LAVENDER)
open_flame() open_flame()
else else
STOP_PROCESSING(SSobj, src) STOP_PROCESSING(SSobj, src)