From 34c6288d227c7ee91efbba0030ce4e1ce30382fa Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Thu, 9 Jan 2020 05:46:30 -0500 Subject: [PATCH 1/6] 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 From 17afb84f949eeeeee4edeca778ca569b8385939c Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 9 Jan 2020 05:53:23 -0500 Subject: [PATCH 2/6] I didnt even touch any maps --- code/game/objects/items/stacks/sheets/sheet_types.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index ce2d2a5e5a..5ddf7e6c5a 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -362,7 +362,6 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \ /* * 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" From 530d710f57a729410403a2097308a5e41bc6d579 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 9 Jan 2020 20:42:07 -0500 Subject: [PATCH 3/6] Update mineral.dm --- code/game/objects/items/stacks/sheets/mineral.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index caf43eff1f..53b78b2ecf 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -372,7 +372,7 @@ GLOBAL_LIST_INIT(adamantine_recipes, list( singular_name = "snow block" force = 1 throwforce = 2 - grind_results = list("ice" = 20) + grind_results = list(/datum/reagent/consumable/ice = 20) merge_type = /obj/item/stack/sheet/mineral/snow GLOBAL_LIST_INIT(snow_recipes, list ( \ @@ -441,4 +441,4 @@ GLOBAL_LIST_INIT(abductor_recipes, list ( \ amount = 5 /obj/item/stack/sheet/mineral/coal/ten - amount = 10 \ No newline at end of file + amount = 10 From 3c877c96f51301cd8317f7ccaf98c3aba157a736 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 9 Jan 2020 20:42:56 -0500 Subject: [PATCH 4/6] Update sheet_types.dm --- code/game/objects/items/stacks/sheets/sheet_types.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index e3b2861b2d..a80f0d5a3b 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -717,7 +717,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) + grind_results = list(/datum/reagent/glitter/white = 60) merge_type = /obj/item/stack/sheet/plastic /obj/item/stack/sheet/plastic/fifty From d463ba8eddf52fd2dc78c3b6dc837a606c229994 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 9 Jan 2020 20:43:31 -0500 Subject: [PATCH 5/6] Update others.dm --- code/modules/reagents/chemistry/recipes/others.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index c3e09d6bb9..d4c71ebb44 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -734,7 +734,7 @@ name = "pink glitter from white" id = "pink_glitter_white" results = list(/datum/reagent/glitter/pink = 2) - required_reagents = list("white_glitter" = 1, /datum/reagent/colorful_reagent/crayonpowder/red = 1) + 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" From ca848e547f1c05c785960b7944bafa1192c150bc Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 12 Jan 2020 02:49:42 -0600 Subject: [PATCH 6/6] Automatic changelog generation for PR #10492 [ci skip] --- html/changelogs/AutoChangeLog-pr-10492.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10492.yml diff --git a/html/changelogs/AutoChangeLog-pr-10492.yml b/html/changelogs/AutoChangeLog-pr-10492.yml new file mode 100644 index 0000000000..de6ab309ab --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10492.yml @@ -0,0 +1,4 @@ +author: "Trilbyspaceclone" +delete-after: True +changes: + - rscadd: "Glitter is now makeable with ground plastic and some crayons"