From 34c6288d227c7ee91efbba0030ce4e1ce30382fa Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Thu, 9 Jan 2020 05:46:30 -0500 Subject: [PATCH] so fantastic! --- .../objects/items/stacks/sheets/mineral.dm | 46 +++++++++---------- .../items/stacks/sheets/sheet_types.dm | 24 ++++++---- .../reagents/chemistry/recipes/others.dm | 38 +++++++++++++++ 3 files changed, 76 insertions(+), 32 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index fe42f88f56..b70388d9e0 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -332,29 +332,6 @@ GLOBAL_LIST_INIT(plastitanium_recipes, list ( \ . = ..() -/* - * 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("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 +363,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("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 */ diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index b20f412620..ce2d2a5e5a 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -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("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,10 @@ 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 +376,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 +401,6 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \ recipes = GLOB.durathread_recipes return ..() - - /* * Cardboard */ @@ -487,7 +494,6 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \ else . = ..() - /* * Runed Metal */ @@ -712,6 +718,7 @@ GLOBAL_LIST_INIT(plastic_recipes, list( item_state = "sheet-plastic" materials = list(MAT_PLASTIC=MINERAL_MATERIAL_AMOUNT) throwforce = 7 + grind_results = list("white_glitter" = 60) merge_type = /obj/item/stack/sheet/plastic /obj/item/stack/sheet/plastic/fifty @@ -748,7 +755,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" diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index ad349ea926..2b775bcbe2 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -709,3 +709,41 @@ id = "royalbluecarpet" results = list("royalbluecarpet" = 2) required_reagents = list("carpet" = 1, "clonexadone" = 1) + +//////////////////////////////////// Glitter /////////////////////////////////////////// + +/datum/chemical_reaction/white_glitter/blue + name = "white glitter from blue" + id = "white_glitter_blue" + results = list("white_glitter" = 2) + required_reagents = list("blue_glitter" = 1, "whitecrayonpowder" = 1) + +/datum/chemical_reaction/white_glitter/pink + name = "white glitter from pink" + id = "white_glitter_pink" + results = list("white_glitter" = 2) + required_reagents = list("pink_glitter" = 1, "whitecrayonpowder" = 1) + +/datum/chemical_reaction/pink_glitter/blue + name = "pink glitter from blue" + id = "pink_glitter_blue" + results = list("pink_glitter" = 2) + required_reagents = list("blue_glitter" = 1, "redcrayonpowder" = 1) + +/datum/chemical_reaction/pink_glitter/white + name = "pink glitter from white" + id = "pink_glitter_white" + results = list("pink_glitter" = 2) + required_reagents = list("white_glitter" = 1, "redcrayonpowder" = 1) + +/datum/chemical_reaction/blue_glitter/pink + name = "blue glitter from pink" + id = "blue_glitter_pink" + results = list("blue_glitter" = 2) + required_reagents = list("pink_glitter" = 1, "bluecrayonpowder" = 1) + +/datum/chemical_reaction/blue_glitter/white + name = "blue glitter from white" + id = "blue_glitter_white" + results = list("blue_glitter" = 2) + required_reagents = list("white_glitter" = 1, "bluecrayonpowder" = 1) \ No newline at end of file