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

2020-01-12 02:51:21 -06:00
parent 2842434d00 ca848e547f
commit 55c6e0d97e
4 changed files with 80 additions and 34 deletions
@@ -331,30 +331,6 @@ GLOBAL_LIST_INIT(plastitanium_recipes, list ( \
 	recipes = GLOB.plastitanium_recipes
 	. = ..()

-
-/*
- * Snow
- */
-/obj/item/stack/sheet/mineral/snow
-	name = "snow"
-	icon_state = "sheet-snow"
-	item_state = "sheet-snow"
-	singular_name = "snow block"
-	force = 1
-	throwforce = 2
-	grind_results = list(/datum/reagent/consumable/ice = 20)
-	merge_type = /obj/item/stack/sheet/mineral/snow
-
-GLOBAL_LIST_INIT(snow_recipes, list ( \
-	new/datum/stack_recipe("Snow Wall", /turf/closed/wall/mineral/snow, 5, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("Snowman", /obj/structure/statue/snow/snowman, 5, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("Snowball", /obj/item/toy/snowball, 1), \
-	))
-
-/obj/item/stack/sheet/mineral/snow/Initialize(mapload, new_amount, merge = TRUE)
-	recipes = GLOB.snow_recipes
-	. = ..()
-
 /****************************** Others ****************************/

 /*
@@ -386,6 +362,29 @@ GLOBAL_LIST_INIT(adamantine_recipes, list(
 	novariants = TRUE
 	merge_type = /obj/item/stack/sheet/mineral/mythril

+/*
+ * Snow
+ */
+/obj/item/stack/sheet/mineral/snow
+	name = "snow"
+	icon_state = "sheet-snow"
+	item_state = "sheet-snow"
+	singular_name = "snow block"
+	force = 1
+	throwforce = 2
+	grind_results = list(/datum/reagent/consumable/ice = 20)
+	merge_type = /obj/item/stack/sheet/mineral/snow
+
+GLOBAL_LIST_INIT(snow_recipes, list ( \
+	new/datum/stack_recipe("Snow Wall", /turf/closed/wall/mineral/snow, 5, one_per_turf = 1, on_floor = 1), \
+	new/datum/stack_recipe("Snowman", /obj/structure/statue/snow/snowman, 5, one_per_turf = 1, on_floor = 1), \
+	new/datum/stack_recipe("Snowball", /obj/item/toy/snowball, 1), \
+	))
+
+/obj/item/stack/sheet/mineral/snow/Initialize(mapload, new_amount, merge = TRUE)
+	recipes = GLOB.snow_recipes
+	. = ..()
+
 /*
 * Alien Alloy
 */
@@ -442,4 +441,4 @@ GLOBAL_LIST_INIT(abductor_recipes, list ( \
 	amount = 5

 /obj/item/stack/sheet/mineral/coal/ten
-	amount = 10
+	amount = 10
@@ -3,13 +3,18 @@
 * Metal
 * Plasteel
 * Wood
+ * Bamboo
 * Cloth
- * Plastic
+ * Silk
+ * Durathread
 * Cardboard
- * Paper Frames
 * Runed Metal (cult)
 * Brass (clockwork cult)
 * Bronze (bake brass)
+ * Gems
+ * Bones
+ * Plastic
+ * Paper Frames
 * Cotton/Duracotton
 */

@@ -240,7 +245,6 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
 	novariants = TRUE
 	grind_results = list(/datum/reagent/carbon = 20)

-
 /obj/item/stack/sheet/mineral/wood/attackby(obj/item/W, mob/user, params) // NOTE: sheet_types.dm is where the WOOD stack lives. Maybe move this over there.
 	// Taken from /obj/item/stack/rods/attackby in [rods.dm]
 	if(W.get_sharpness())
@@ -302,7 +306,6 @@ GLOBAL_LIST_INIT(bamboo_recipes, list ( \
 	recipes = GLOB.bamboo_recipes
 	return ..()

-
 /*
 * Cloth
 */
@@ -356,6 +359,9 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
 /obj/item/stack/sheet/cloth/thirty
 	amount = 30

+/*
+ * Silk
+ */
 /obj/item/stack/sheet/silk
 	name = "silk"
 	desc = "A long soft material. This one is just made out of cotton rather then any spiders or wyrms"
@@ -369,7 +375,9 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
 //	recipes = GLOB.silk_recipes
 //	return ..()

-//Durathread fuck slash-asterisk comments
+/*
+ * Durathread
+ */
 	GLOBAL_LIST_INIT(durathread_recipes, list ( \
 	new/datum/stack_recipe("durathread jumpsuit", /obj/item/clothing/under/durathread, 4, time = 40),
 	new/datum/stack_recipe("durathread beret", /obj/item/clothing/head/beret/durathread, 2, time = 40), \
@@ -392,8 +400,6 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
 	recipes = GLOB.durathread_recipes
 	return ..()

-
-
 /*
 * Cardboard
 */
@@ -487,7 +493,6 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \
 	else
 		. = ..()

-
 /*
 * Runed Metal
 */
@@ -712,6 +717,7 @@ GLOBAL_LIST_INIT(plastic_recipes, list(
 	item_state = "sheet-plastic"
 	materials = list(MAT_PLASTIC=MINERAL_MATERIAL_AMOUNT)
 	throwforce = 7
+	grind_results = list(/datum/reagent/glitter/white = 60)
 	merge_type = /obj/item/stack/sheet/plastic

 /obj/item/stack/sheet/plastic/fifty
@@ -748,7 +754,6 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra
 /obj/item/stack/sheet/paperframes/fifty
 	amount = 50

-
 //durathread and cotton raw
 /obj/item/stack/sheet/cotton
 	name = "raw cotton bundle"
@@ -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)
@@ -0,0 +1,4 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes: 
+  - rscadd: "Glitter is now makeable with ground plastic and some crayons"