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

Crayons have powder back, but it doesn't color anymore (#46715)

Browse Source 
* cray

* things gatrg yrty rthh

* things fixed

* Update code/modules/reagents/chemistry/reagents/other_reagents.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* Update code/modules/reagents/chemistry/reagents/other_reagents.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* Update code/modules/reagents/chemistry/reagents/other_reagents.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
This commit is contained in:
carlarctg
2019-10-06 01:38:16 -04:00
committed by moo
co-authored by moo
parent 0dbec8353f
commit 88c6761316
3 changed files with 60 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/crayons.dm
+11 -11
View File
@@ -59,7 +59,7 @@
var/edible = TRUE // That doesn't mean eating it is a good idea
var/list/reagent_contents = list(/datum/reagent/consumable/nutriment = 1)
var/list/reagent_contents = list(/datum/reagent/consumable/nutriment = 0.5)
// If the user can toggle the colour, a la vanilla spraycan
var/can_change_colour = FALSE
@@ -431,56 +431,56 @@
icon_state = "crayonred"
paint_color = "#DA0000"
crayon_color = "red"
reagent_contents = list(/datum/reagent/consumable/nutriment = 1)
reagent_contents = list(/datum/reagent/consumable/nutriment = 0.5, /datum/reagent/colorful_reagent/powder/red/crayon = 1.5)
dye_color = DYE_RED
/obj/item/toy/crayon/orange
icon_state = "crayonorange"
paint_color = "#FF9300"
crayon_color = "orange"
reagent_contents = list(/datum/reagent/consumable/nutriment = 1)
reagent_contents = list(/datum/reagent/consumable/nutriment = 0.5, /datum/reagent/colorful_reagent/powder/orange/crayon = 1.5)
dye_color = DYE_ORANGE
/obj/item/toy/crayon/yellow
icon_state = "crayonyellow"
paint_color = "#FFF200"
crayon_color = "yellow"
reagent_contents = list(/datum/reagent/consumable/nutriment = 1)
reagent_contents = list(/datum/reagent/consumable/nutriment = 0.5, /datum/reagent/colorful_reagent/powder/yellow/crayon = 1.5)
dye_color = DYE_YELLOW
/obj/item/toy/crayon/green
icon_state = "crayongreen"
paint_color = "#A8E61D"
crayon_color = "green"
reagent_contents = list(/datum/reagent/consumable/nutriment = 1)
reagent_contents = list(/datum/reagent/consumable/nutriment = 0.5, /datum/reagent/colorful_reagent/powder/green/crayon = 1.5)
dye_color = DYE_GREEN
/obj/item/toy/crayon/blue
icon_state = "crayonblue"
paint_color = "#00B7EF"
crayon_color = "blue"
reagent_contents = list(/datum/reagent/consumable/nutriment = 1)
reagent_contents = list(/datum/reagent/consumable/nutriment = 0.5, /datum/reagent/colorful_reagent/powder/blue/crayon = 1.5)
dye_color = DYE_BLUE
/obj/item/toy/crayon/purple
icon_state = "crayonpurple"
paint_color = "#DA00FF"
crayon_color = "purple"
reagent_contents = list(/datum/reagent/consumable/nutriment = 1)
reagent_contents = list(/datum/reagent/consumable/nutriment = 0.5, /datum/reagent/colorful_reagent/powder/purple/crayon = 1.5)
dye_color = DYE_PURPLE
/obj/item/toy/crayon/black
icon_state = "crayonblack"
paint_color = "#1C1C1C" //Not completely black because total black looks bad. So Mostly Black.
crayon_color = "black"
reagent_contents = list(/datum/reagent/consumable/nutriment = 1)
reagent_contents = list(/datum/reagent/consumable/nutriment = 0.5, /datum/reagent/colorful_reagent/powder/black/crayon = 1.5)
dye_color = DYE_BLACK
/obj/item/toy/crayon/white
icon_state = "crayonwhite"
paint_color = "#FFFFFF"
crayon_color = "white"
reagent_contents = list(/datum/reagent/consumable/nutriment = 1)
reagent_contents = list(/datum/reagent/consumable/nutriment = 0.5, /datum/reagent/colorful_reagent/powder/white/crayon = 1.5)
dye_color = DYE_WHITE
/obj/item/toy/crayon/mime
@@ -488,7 +488,7 @@
desc = "A very sad-looking crayon."
paint_color = "#FFFFFF"
crayon_color = "mime"
reagent_contents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/colorful_reagent/powder/invisible = 1)
reagent_contents = list(/datum/reagent/consumable/nutriment = 0.5, /datum/reagent/colorful_reagent/powder/invisible = 1.5)
charges = -1
dye_color = DYE_MIME
@@ -496,7 +496,7 @@
icon_state = "crayonrainbow"
paint_color = "#FFF000"
crayon_color = "rainbow"
reagent_contents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/colorful_reagent = 1)
reagent_contents = list(/datum/reagent/consumable/nutriment = 0.5, /datum/reagent/colorful_reagent = 1.5)
drawtype = RANDOM_ANY // just the default starter.
charges = -1
dye_color = DYE_RAINBOW
code/modules/food_and_drinks/recipes/drinks_recipes.dm
+6
View File
@@ -180,6 +180,12 @@
results = list(/datum/reagent/consumable/ethanol/beer/green = 10)
required_reagents = list(/datum/reagent/colorful_reagent/powder/green = 1, /datum/reagent/consumable/ethanol/beer = 10)
/datum/chemical_reaction/greenbeer2 //apparently there's no other way to do this
name = "Green Beer"
id = /datum/reagent/consumable/ethanol/beer/green
results = list(/datum/reagent/consumable/ethanol/beer/green = 10)
required_reagents = list(/datum/reagent/colorful_reagent/powder/green/crayon = 1, /datum/reagent/consumable/ethanol/beer = 10)
/datum/chemical_reaction/hooch
name = "Hooch"
id = /datum/reagent/consumable/ethanol/hooch
code/modules/reagents/chemistry/reagents/other_reagents.dm
+43 -6
View File
@@ -1216,7 +1216,6 @@
/////////////////////////Colorful Powder////////////////////////////
//For colouring in /proc/mix_color_from_reagents
/datum/reagent/colorful_reagent/powder
name = "Mundane Powder" //the name's a bit similar to the name of colorful reagent, but hey, they're practically the same chem anyway
var/colorname = "none"
@@ -1233,7 +1232,6 @@
else
description = "\An [colorname] powder, used for coloring things [colorname]."
/datum/reagent/colorful_reagent/powder/red
name = "Red Powder"
colorname = "red"
@@ -1288,6 +1286,42 @@
color = "#FFFFFF" // white
random_color_list = list("#FFFFFF") //doesn't actually change appearance at all
/* used by crayons, can't color living things but still used for stuff like food recipes */
/datum/reagent/colorful_reagent/powder/red/crayon
name = "Red Crayon Powder"
can_colour_mobs = FALSE
/datum/reagent/colorful_reagent/powder/orange/crayon
name = "Orange Crayon Powder"
can_colour_mobs = FALSE
/datum/reagent/colorful_reagent/powder/yellow/crayon
name = "Yellow Crayon Powder"
can_colour_mobs = FALSE
/datum/reagent/colorful_reagent/powder/green/crayon
name = "Green Crayon Powder"
can_colour_mobs = FALSE
/datum/reagent/colorful_reagent/powder/blue/crayon
name = "Blue Crayon Powder"
can_colour_mobs = FALSE
/datum/reagent/colorful_reagent/powder/purple/crayon
name = "Purple Crayon Powder"
can_colour_mobs = FALSE
//datum/reagent/colorful_reagent/powder/invisible/crayon
/datum/reagent/colorful_reagent/powder/black/crayon
name = "Black Crayon Powder"
can_colour_mobs = FALSE
/datum/reagent/colorful_reagent/powder/white/crayon
name = "White Crayon Powder"
can_colour_mobs = FALSE
//////////////////////////////////Hydroponics stuff///////////////////////////////
/datum/reagent/plantnutriment
@@ -1405,15 +1439,18 @@
color = "#C8A5DC"
var/list/random_color_list = list("#00aedb","#a200ff","#f47835","#d41243","#d11141","#00b159","#00aedb","#f37735","#ffc425","#008744","#0057e7","#d62d20","#ffa700")
taste_description = "rainbows"
var/can_colour_mobs = TRUE
/datum/reagent/colorful_reagent/on_mob_life(mob/living/carbon/M)
M.add_atom_colour(pick(random_color_list), WASHABLE_COLOUR_PRIORITY)
..()
if(can_colour_mobs)
M.add_atom_colour(pick(random_color_list), WASHABLE_COLOUR_PRIORITY)
return ..()
/datum/reagent/colorful_reagent/reaction_mob(mob/living/M, reac_volume)
M.add_atom_colour(pick(random_color_list), WASHABLE_COLOUR_PRIORITY)
..()
if(can_colour_mobs)
M.add_atom_colour(pick(random_color_list), WASHABLE_COLOUR_PRIORITY)
..()
/datum/reagent/colorful_reagent/reaction_obj(obj/O, reac_volume)
if(O)