cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-09 16:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Floor painter, turf, and decal tweaks.

Browse Source 
Makes several custom color definitions, utilized by the floor painter, floor tiles, decals, etc.
Colored floor turfs now use a white icon state and applies a color, similar to the corresponding decals. This ensures they have the same color tone (was slightly off previously).
Colored floor tiles also use a white icon state and color application.
Removes now unused item states.
This commit is contained in:
PsiOmegaDelta
2015-09-21 14:38:58 +02:00
parent 7d7f0da2ca
commit 8a1b414e28
7 changed files with 64 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/__defines/misc.dm
View File

@@ -167,3 +167,17 @@
// Special return values from bullet_act(). Positive return values are already used to indicate the blocked level of the projectile.
#define PROJECTILE_CONTINUE -1 //if the projectile should continue flying after calling bullet_act()
#define PROJECTILE_FORCE_MISS -2 //if the projectile should treat the attack as a miss (suppresses attack and admin logs) - only applies to mobs.
// Custom colors
#define COLOR_BEIGE "#CEB689"
#define COLOR_BLUE_GRAY "#6A97B0"
#define COLOR_BROWN "#B19664"
#define COLOR_DARK_BROWN "#917448"
#define COLOR_DARK_ORANGE "#B95A00"
#define COLOR_GREEN_GRAY "#8DAF6A"
#define COLOR_RED_GRAY "#AA5F61"
#define COLOR_PALE_BLUE_GRAY "#8BBBD5"
#define COLOR_PALE_GREEN_GRAY "#AED18B"
#define COLOR_PALE_RED_GRAY "#CC9090"
#define COLOR_PALE_PURPLE_GRAY "#BDA2BA"
#define COLOR_PURPLE_GRAY "#A2819E"

60
code/game/objects/items/devices/floor_painter.dm
View File

@@ -12,7 +12,7 @@
"quarter-turf" = list("path" = /obj/effect/floor_decal/corner, "precise" = 1, "coloured" = 1),
"hazard stripes" = list("path" = /obj/effect/floor_decal/industrial/warning),
"corner, hazard" = list("path" = /obj/effect/floor_decal/industrial/warning/corner),
"hatched marking" = list("path" = /obj/effect/floor_decal/industrial/hatch),
"hatched marking" = list("path" = /obj/effect/floor_decal/industrial/hatch, "coloured" = 1),
"dotted outline" = list("path" = /obj/effect/floor_decal/industrial/outline, "coloured" = 1),
"loading sign" = list("path" = /obj/effect/floor_decal/industrial/loading),
"1" = list("path" = /obj/effect/floor_decal/sign),
@@ -40,35 +40,35 @@
"precise" = 0
)
var/list/paint_colours = list(
"white" = COLOR_WHITE,
"light gray" = COLOR_SILVER,
"dark gray" = COLOR_GRAY,
"blue-grey" = "#6A97B0",
"pale blue-grey" = "#8BBBD5",
"green-grey" = "#8DAF6A",
"pale green-gray" = "#AED18B",
"red-gray" = "#AA5F61",
"pale red-gray" = "#CC9090",
"purple-gray" = "#A2819E",
"pale purple-gray" = "#BDA2BA",
"black" = COLOR_BLACK,
"red" = COLOR_RED,
"dark red" = COLOR_MAROON,
"yellow" = COLOR_YELLOW,
"dark yellow" = COLOR_OLIVE,
"green" = COLOR_LIME,
"dark green" = COLOR_GREEN,
"cyan" = COLOR_CYAN,
"teal" = COLOR_TEAL,
"blue" = COLOR_BLUE,
"dark blue" = COLOR_NAVY,
"magenta" = COLOR_PINK,
"purple" = COLOR_PURPLE,
"orange" = COLOR_ORANGE,
"dark orange" = "#B95A00",
"dark brown" = "#917448",
"brown" = "#B19664",
"pale brown" = "#CEB689"
"white" = COLOR_WHITE,
"light gray" = COLOR_SILVER,
"dark gray" = COLOR_GRAY,
"blue-gray" = COLOR_BLUE_GRAY,
"pale blue-gray" = COLOR_PALE_BLUE_GRAY,
"green-gray" = COLOR_GREEN_GRAY,
"pale green-gray" = COLOR_PALE_GREEN_GRAY,
"red-gray" = COLOR_RED_GRAY,
"pale red-gray" = COLOR_PALE_RED_GRAY,
"purple-gray" = COLOR_PURPLE_GRAY,
"pale purple-gray" = COLOR_PALE_PURPLE_GRAY,
"black" = COLOR_BLACK,
"red" = COLOR_RED,
"dark red" = COLOR_MAROON,
"yellow" = COLOR_YELLOW,
"dark yellow" = COLOR_OLIVE,
"green" = COLOR_LIME,
"dark green" = COLOR_GREEN,
"cyan" = COLOR_CYAN,
"teal" = COLOR_TEAL,
"blue" = COLOR_BLUE,
"dark blue" = COLOR_NAVY,
"magenta" = COLOR_PINK,
"purple" = COLOR_PURPLE,
"orange" = COLOR_ORANGE,
"dark orange" = COLOR_DARK_ORANGE,
"dark brown" = COLOR_DARK_BROWN,
"brown" = COLOR_BROWN,
"pale brown" = COLOR_BEIGE
)
/obj/item/device/floor_painter/afterattack(var/atom/A, var/mob/user, proximity, params)

6
code/game/objects/items/stacks/tiles/tile_types.dm
View File

@@ -85,7 +85,8 @@
/obj/item/stack/tile/floor_red
name = "red floor tile"
singular_name = "red floor tile"
icon_state = "tile_red"
color = COLOR_RED_GRAY
icon_state = "tile_white"
/obj/item/stack/tile/floor_steel
name = "steel floor tile"
@@ -102,7 +103,8 @@
/obj/item/stack/tile/floor_yellow
name = "yellow floor tile"
singular_name = "yellow floor tile"
icon_state = "tile_yellow"
color = COLOR_BROWN
icon_state = "tile_white"
/obj/item/stack/tile/floor_dark
name = "dark floor tile"

24
code/game/turfs/flooring/flooring_decals.dm
View File

@@ -56,7 +56,7 @@ var/list/floor_decals = list()
/obj/effect/floor_decal/corner/blue
name = "blue corner"
color = "#6A97B0"
color = COLOR_BLUE_GRAY
/obj/effect/floor_decal/corner/blue/diagonal
icon_state = "corner_white_diagonal"
@@ -66,7 +66,7 @@ var/list/floor_decals = list()
/obj/effect/floor_decal/corner/paleblue
name = "pale blue corner"
color = "#8BBBD5"
color = COLOR_PALE_BLUE_GRAY
/obj/effect/floor_decal/corner/paleblue/diagonal
icon_state = "corner_white_diagonal"
@@ -76,7 +76,7 @@ var/list/floor_decals = list()
/obj/effect/floor_decal/corner/green
name = "green corner"
color = "#8DAF6A"
color = COLOR_GREEN_GRAY
/obj/effect/floor_decal/corner/green/diagonal
icon_state = "corner_white_diagonal"
@@ -86,7 +86,7 @@ var/list/floor_decals = list()
/obj/effect/floor_decal/corner/lime
name = "lime corner"
color = "#AED18B"
color = COLOR_PALE_GREEN_GRAY
/obj/effect/floor_decal/corner/lime/diagonal
icon_state = "corner_white_diagonal"
@@ -96,7 +96,7 @@ var/list/floor_decals = list()
/obj/effect/floor_decal/corner/yellow
name = "yellow corner"
color = "#B19664"
color = COLOR_BROWN
/obj/effect/floor_decal/corner/yellow/diagonal
icon_state = "corner_white_diagonal"
@@ -106,7 +106,7 @@ var/list/floor_decals = list()
/obj/effect/floor_decal/corner/beige
name = "beige corner"
color = "#CEB689"
color = COLOR_BEIGE
/obj/effect/floor_decal/corner/beige/diagonal
icon_state = "corner_white_diagonal"
@@ -116,7 +116,7 @@ var/list/floor_decals = list()
/obj/effect/floor_decal/corner/red
name = "red corner"
color = "#AA5F61"
color = COLOR_RED_GRAY
/obj/effect/floor_decal/corner/red/diagonal
icon_state = "corner_white_diagonal"
@@ -126,7 +126,7 @@ var/list/floor_decals = list()
/obj/effect/floor_decal/corner/pink
name = "pink corner"
color = "#CC9090"
color = COLOR_PALE_RED_GRAY
/obj/effect/floor_decal/corner/pink/diagonal
icon_state = "corner_white_diagonal"
@@ -136,7 +136,7 @@ var/list/floor_decals = list()
/obj/effect/floor_decal/corner/purple
name = "purple corner"
color = "#A2819E"
color = COLOR_PURPLE_GRAY
/obj/effect/floor_decal/corner/purple/diagonal
icon_state = "corner_white_diagonal"
@@ -146,7 +146,7 @@ var/list/floor_decals = list()
/obj/effect/floor_decal/corner/mauve
name = "mauve corner"
color = "#BDA2BA"
color = COLOR_PALE_PURPLE_GRAY
/obj/effect/floor_decal/corner/mauve/diagonal
icon_state = "corner_white_diagonal"
@@ -156,7 +156,7 @@ var/list/floor_decals = list()
/obj/effect/floor_decal/corner/orange
name = "orange corner"
color = "#B95A00"
color = COLOR_DARK_ORANGE
/obj/effect/floor_decal/corner/orange/diagonal
icon_state = "corner_white_diagonal"
@@ -166,7 +166,7 @@ var/list/floor_decals = list()
/obj/effect/floor_decal/corner/brown
name = "brown corner"
color = "#917448"
color = COLOR_DARK_BROWN
/obj/effect/floor_decal/corner/brown/diagonal
icon_state = "corner_white_diagonal"

6
code/game/turfs/flooring/flooring_premade.dm
View File

@@ -97,7 +97,8 @@
/turf/simulated/floor/tiled/red
name = "red floor"
icon_state = "red"
color = COLOR_RED_GRAY
icon_state = "white"
initial_flooring = /decl/flooring/tiling/red
/turf/simulated/floor/tiled/steel
@@ -112,7 +113,8 @@
/turf/simulated/floor/tiled/yellow
name = "yellow floor"
icon_state = "yellow"
color = COLOR_BROWN
icon_state = "white"
initial_flooring = /decl/flooring/tiling/yellow
/turf/simulated/floor/tiled/freezer

BIN
icons/obj/items.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 62 KiB

BIN
icons/turf/flooring/tiles.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 20 KiB