cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-21 20:20:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MDB IGNORE] Grayscale sofas (#71539)

Browse Source 
## About The Pull Request
Ports some sofa sprites from over at
https://github.com/BeeStation/BeeStation-Hornet/pull/7547 and makes them
grayscale. Also random tool colours now use defines.


![image](https://user-images.githubusercontent.com/66640614/204077835-94b713a9-a7e5-42fc-8c65-5724ca11cc4a.png)


![image](https://user-images.githubusercontent.com/66640614/204077844-87b33cda-d829-4ebb-a81f-a5e05453999d.png)

## Why It's Good For The Game
Gives us the opportunity to make different coloured couches more easily.
## Changelog

🆑 Tattle, PestoVerde322
imageadd: couches are now grayscale
code: random tool colours now use defines
/🆑

Co-authored-by: tattle <article.disaster@gmail.com>
This commit is contained in:
tattle
2022-11-30 19:01:24 -08:00
committed by GitHub
co-authored by tattle
parent 9efc06c9d2
commit 0bb30cdefc
21 changed files with 176 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/tools/screwdriver.dm
+8 -9
View File
@@ -35,13 +35,13 @@
var/random_color = TRUE
/// List of possible random colors
var/static/list/screwdriver_colors = list(
"blue" = "#1861d5",
"red" = "#ff0000",
"pink" = "#d5188d",
"brown" = "#a05212",
"green" = "#0e7f1b",
"cyan" = "#18a2d5",
"yellow" = "#ffa500"
COLOR_TOOL_BLUE,
COLOR_TOOL_RED,
COLOR_TOOL_PINK,
COLOR_TOOL_BROWN,
COLOR_TOOL_GREEN,
COLOR_TOOL_CYAN,
COLOR_TOOL_YELLOW,
)
/obj/item/screwdriver/suicide_act(mob/living/user)
@@ -50,8 +50,7 @@
/obj/item/screwdriver/Initialize(mapload)
if(random_color)
var/our_color = pick(screwdriver_colors)
set_greyscale(colors=list(screwdriver_colors[our_color]))
set_greyscale(colors = list(pick(screwdriver_colors)))
. = ..()
AddElement(/datum/element/eyestab)
AddElement(/datum/element/falling_hazard, damage = force, wound_bonus = wound_bonus, hardhat_safety = TRUE, crushes = FALSE, impact_sound = hitsound)
code/game/objects/items/tools/wirecutters.dm
+8 -9
View File
@@ -33,19 +33,18 @@
var/random_color = TRUE
/// List of possible random colors
var/static/list/wirecutter_colors = list(
"blue" = "#1861d5",
"red" = "#951710",
"pink" = "#d5188d",
"brown" = "#a05212",
"green" = "#0e7f1b",
"cyan" = "#18a2d5",
"yellow" = "#d58c18"
COLOR_TOOL_BLUE,
COLOR_TOOL_RED,
COLOR_TOOL_PINK,
COLOR_TOOL_BROWN,
COLOR_TOOL_GREEN,
COLOR_TOOL_CYAN,
COLOR_TOOL_YELLOW,
)
/obj/item/wirecutters/Initialize(mapload)
if(random_color)
var/our_color = pick(wirecutter_colors)
set_greyscale(colors=list(wirecutter_colors[our_color]))
set_greyscale(colors = list(pick(wirecutter_colors)))
AddElement(/datum/element/falling_hazard, damage = force, wound_bonus = wound_bonus, hardhat_safety = TRUE, crushes = FALSE, impact_sound = hitsound)