shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40920

Browse Source
This commit is contained in:
Hatterhat
2020-01-12 02:51:21 -06:00
parent 2842434d00 ca848e547f
commit 55c6e0d97e
4 changed files with 80 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/recipes/others.dm
+38
View File
@@ -709,3 +709,41 @@
id = /datum/reagent/carpet/royalblue
results = list(/datum/reagent/carpet/royalblue = 2)
required_reagents = list(/datum/reagent/carpet = 1, /datum/reagent/medicine/clonexadone = 1)
//////////////////////////////////// Glitter ///////////////////////////////////////////
/datum/chemical_reaction/white_glitter/blue
name = "white glitter from blue"
id = "white_glitter_blue"
results = list(/datum/reagent/glitter/white = 2)
required_reagents = list(/datum/reagent/glitter/blue = 1, /datum/reagent/colorful_reagent/crayonpowder/white = 1)
/datum/chemical_reaction/white_glitter/pink
name = "white glitter from pink"
id = "white_glitter_pink"
results = list(/datum/reagent/glitter/white = 2)
required_reagents = list(/datum/reagent/glitter/pink = 1, /datum/reagent/colorful_reagent/crayonpowder/white = 1)
/datum/chemical_reaction/pink_glitter/blue
name = "pink glitter from blue"
id = "pink_glitter_blue"
results = list(/datum/reagent/glitter/pink = 2)
required_reagents = list(/datum/reagent/glitter/blue = 1, /datum/reagent/colorful_reagent/crayonpowder/red = 1)
/datum/chemical_reaction/pink_glitter/white
name = "pink glitter from white"
id = "pink_glitter_white"
results = list(/datum/reagent/glitter/pink = 2)
required_reagents = list(/datum/reagent/glitter/white = 1, /datum/reagent/colorful_reagent/crayonpowder/red = 1)
/datum/chemical_reaction/blue_glitter/pink
name = "blue glitter from pink"
id = "blue_glitter_pink"
results = list(/datum/reagent/glitter/blue = 2)
required_reagents = list(/datum/reagent/glitter/pink = 1, /datum/reagent/colorful_reagent/crayonpowder/blue = 1)
/datum/chemical_reaction/blue_glitter/white
name = "blue glitter from white"
id = "blue_glitter_white"
results = list(/datum/reagent/glitter/blue = 2)
required_reagents = list(/datum/reagent/glitter/white = 1, /datum/reagent/colorful_reagent/crayonpowder/blue = 1)