From aef8b5f77b212c8af3cc7e987b534a6a0492626c Mon Sep 17 00:00:00 2001 From: TheObserver-sys Date: Fri, 25 Feb 2022 13:33:32 -0500 Subject: [PATCH 1/3] liquid carpet and recipes. initial. --- code/modules/hydroponics/seedtypes/grass.dm | 2 +- .../reagents/reactions/instant/instant.dm | 101 ++++++++++++++++++ code/modules/reagents/reagents/other.dm | 64 +++++++++++ 3 files changed, 166 insertions(+), 1 deletion(-) diff --git a/code/modules/hydroponics/seedtypes/grass.dm b/code/modules/hydroponics/seedtypes/grass.dm index d8629a00ae3..25231b84a8a 100644 --- a/code/modules/hydroponics/seedtypes/grass.dm +++ b/code/modules/hydroponics/seedtypes/grass.dm @@ -25,7 +25,7 @@ display_name = "carpet" kitchen_tag = "carpet" mutants = null - chems = list("nutiment" = list(1,10)) + chems = list("liquidcarpet" = list(5,10)) /datum/seed/grass/carpet/New() ..() diff --git a/code/modules/reagents/reactions/instant/instant.dm b/code/modules/reagents/reactions/instant/instant.dm index 6f49a56ef36..8fa39fb9986 100644 --- a/code/modules/reagents/reactions/instant/instant.dm +++ b/code/modules/reagents/reactions/instant/instant.dm @@ -633,6 +633,62 @@ new /obj/item/stack/material/plastic(get_turf(holder.my_atom), created_volume) return +/*Carpet Creation*/ +/decl/chemical_reaction/instant/carpetify + name = "Carpet" + id = "redcarpet" + result = null + required_reagents = list("liquidcarpet" = 2, "plasticide" = 1) + result_amount = 2 + var/carpet_type = /obj/item/stack/tile/carpet + +/decl/chemical_reaction/instant/carpetify/on_reaction(var/datum/reagents/holder, var/created_volume) + new carpet_type(get_turf(holder.my_atom), created_volume) + return + +/decl/chemical_reaction/instant/carpetify/bcarpet + name = "Black Carpet" + id = "blackcarpet" + required_reagents "liquidcarpetb" = 2, "plasticide" = 1) + carpet_type = /obj/item/stack/tile/carpet/bcarpet + +/decl/chemical_reaction/instant/carpetify/blucarpet + name = "Blue Carpet" + id = "bluecarpet" + required_reagents "liquidcarpetblu" = 2, "plasticide" = 1) + carpet_type = /obj/item/stack/tile/carpet/blucarpet + +/decl/chemical_reaction/instant/carpetify/turcarpet + name = "Tur Carpet" + id = "turcarpet" + required_reagents "liquidcarpettur" = 2, "plasticide" = 1) + carpet_type = /obj/item/stack/tile/carpet/turcarpet + +/decl/chemical_reaction/instant/carpetify/sblucarpet + name = "Sblu Carpet" + id = "sblucarpet" + required_reagents "liquidcarpetsblu" = 2, "plasticide" = 1) + carpet_type = /obj/item/stack/tile/carpet/sblucarpet + +/decl/chemical_reaction/instant/carpetify/clowncarpet + name = "Clown Carpet" + id = "clowncarpet" + required_reagents "liquidcarpetc" = 2, "plasticide" = 1) + carpet_type = /obj/item/stack/tile/carpet/gaycarpet + +/decl/chemical_reaction/instant/carpetify/pcarpet + name = "Purple Carpet" + id = "Purplecarpet" + required_reagents "liquidcarpetp" = 2, "plasticide" = 1) + carpet_type = /obj/item/stack/tile/carpet/purcarpet + +/decl/chemical_reaction/instant/carpetify/ocarpet + name = "Orange Carpet" + id = "orangecarpet" + required_reagents "liquidcarpeto" = 2, "plasticide" = 1) + carpet_type = /obj/item/stack/tile/carpet/oracarpet + + /* Grenade reactions */ /decl/chemical_reaction/instant/explosion_potassium @@ -1062,6 +1118,51 @@ /decl/chemical_reaction/instant/aluminum_paint/send_data() return "#F0F8FF" +/*Carpet Recoloring*/ +/decl/chemical_reaction/instant/carpetdye + name = "Black Carpet Dyeing" + id = "carpetdyeblack" + result = "liquidcarpetb" + required_reagents = list("liquidcarpet" = 5, "carbon" = 1) + result_amount = 5 + +/decl/chemical_reaction/instant/carpetdye/blue + name = "Blue Carpet Dyeing" + id = "carpetdyeblue" + result = "liquidcarpetblu" + required_reagents = list("liquidcarpet" = 5, "frostoil" = 1) + +/decl/chemical_reaction/instant/carpetdye/tur + name = "Turqouise Carpet Dyeing" + id = "carpetdyetur" + result = "liquidcarpettur" + required_reagents = list("liquidcarpet" = 5, "water" = 1) + +/decl/chemical_reaction/instant/carpetdye/sblu + name = "Deep Blue Carpet Dyeing" + id = "carpetdyesblu" + result = "liquidcarpetsblu" + required_reagents = list("liquidcarpet" = 5, "ice" = 1) + +/decl/chemical_reaction/instant/carpetdye/clown + name = "Clown Carpet Dyeing" + id = "carpetdyeclown" + result = "liquidcarpetc" + required_reagents = list("liquidcarpet" = 5, "banana" = 1) + +/decl/chemical_reaction/instant/carpetdye/purple + name = "Purple Carpet Dyeing" + id = "carpetdyepurple" + result = "liquidcarpetp" + required_reagents = list("liquidcarpet" = 5, "berryjuice" = 1) + +/decl/chemical_reaction/instant/carpetdye/orange + name = "Orange Carpet Dyeing" + id = "carpetdyeorange" + result = "liquidcarpeto" + required_reagents = list("liquidcarpet" = 5, "orangejuice" = 1) + + //R-UST Port /decl/chemical_reaction/instant/hydrophoron name = "Hydrophoron" diff --git a/code/modules/reagents/reagents/other.dm b/code/modules/reagents/reagents/other.dm index 9016b7177c0..abcf581c893 100644 --- a/code/modules/reagents/reagents/other.dm +++ b/code/modules/reagents/reagents/other.dm @@ -654,3 +654,67 @@ reagent_state = LIQUID color = "#62764E" nutriment_factor = 15 + +/datum/reagent/carpet + name = "Liquid Carpet" + id = "liquidcarpet" + description = "Liquified carpet fibers, ready for dyeing." + reagent_state = LIQUID + color = "#b51d05" + taste_description = "carpet" + +/datum/reagent/carpet/black + name = "Liquid Black Carpet" + id = "liquidcarpetb" + description = "Black Carpet Fibers, ready for reinforcement." + reagent_state = LIQUID + color = "#000000" + taste_description = "rare and ashy carpet" + +/datum/reagent/carpet/blue + name = "Liquid Blue Carpet" + id = "liquidcarpetblu" + description = "Blue Carpet Fibers, ready for reinforcement." + reagent_state = LIQUID + color = "#3f4aee" + taste_description = "freezing carpet" + +/datum/reagent/carpet/turquoise + name = "Liquid Turquoise Carpet" + id = "liquidcarpettur" + description = "Turquoise Carpet Fibers, ready for reinforcement." + reagent_state = LIQUID + color = "#0592b5" + taste_description = "water-logged carpet" + +/datum/reagent/carpet/sblue + name = "Liquid Deep Blue Carpet" + id = "liquidcarpetsblu" + description = "Deep Blue Carpet Fibers, ready for reinforcement." + reagent_state = LIQUID + color = "#0011ff" + taste_description = "commanding carpet" + +/datum/reagent/carpet/clown + name = "Liquid Clown Carpet" + id = "liquidcarpetc" + description = "Clown Carpet Fibers.... No clowns were harmed in the making of this." + reagent_state = LIQUID + color = "#e925be" + taste_description = "clown shoes and banana peels" + +/datum/reagent/carpet/purple + name = "Liquid Purple Carpet" + id = "liquidcarpetp" + description = "Purple Carpet Fibers, ready for reinforcement." + reagent_state = LIQUID + color = "#a614d3" + taste_description = "bleeding edge carpet research" + +/datum/reagent/carpet/orange + name = "Liquid Orange Carpet" + id = "liquidcarpet" + description = "Orange Carpet Fibers, ready for reinforcement." + reagent_state = LIQUID + color = "#f16e16" + taste_description = "extremely overengineered carpet" \ No newline at end of file From da394d5c691a490b842fc0f6611edc6c9e3c0fae Mon Sep 17 00:00:00 2001 From: TheObserver-sys Date: Fri, 25 Feb 2022 13:41:39 -0500 Subject: [PATCH 2/3] pain? --- .../modules/reagents/reactions/instant/instant.dm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/code/modules/reagents/reactions/instant/instant.dm b/code/modules/reagents/reactions/instant/instant.dm index 8fa39fb9986..cd98ca1248e 100644 --- a/code/modules/reagents/reactions/instant/instant.dm +++ b/code/modules/reagents/reactions/instant/instant.dm @@ -634,6 +634,7 @@ return /*Carpet Creation*/ + /decl/chemical_reaction/instant/carpetify name = "Carpet" id = "redcarpet" @@ -649,43 +650,43 @@ /decl/chemical_reaction/instant/carpetify/bcarpet name = "Black Carpet" id = "blackcarpet" - required_reagents "liquidcarpetb" = 2, "plasticide" = 1) + required_reagents = list("liquidcarpetb" = 2, "plasticide" = 1) carpet_type = /obj/item/stack/tile/carpet/bcarpet /decl/chemical_reaction/instant/carpetify/blucarpet name = "Blue Carpet" id = "bluecarpet" - required_reagents "liquidcarpetblu" = 2, "plasticide" = 1) + required_reagents = list ("liquidcarpetblu" = 2, "plasticide" = 1) carpet_type = /obj/item/stack/tile/carpet/blucarpet /decl/chemical_reaction/instant/carpetify/turcarpet name = "Tur Carpet" id = "turcarpet" - required_reagents "liquidcarpettur" = 2, "plasticide" = 1) + required_reagents = list("liquidcarpettur" = 2, "plasticide" = 1) carpet_type = /obj/item/stack/tile/carpet/turcarpet /decl/chemical_reaction/instant/carpetify/sblucarpet name = "Sblu Carpet" id = "sblucarpet" - required_reagents "liquidcarpetsblu" = 2, "plasticide" = 1) + required_reagents = list("liquidcarpetsblu" = 2, "plasticide" = 1) carpet_type = /obj/item/stack/tile/carpet/sblucarpet /decl/chemical_reaction/instant/carpetify/clowncarpet name = "Clown Carpet" id = "clowncarpet" - required_reagents "liquidcarpetc" = 2, "plasticide" = 1) + required_reagents = list("liquidcarpetc" = 2, "plasticide" = 1) carpet_type = /obj/item/stack/tile/carpet/gaycarpet /decl/chemical_reaction/instant/carpetify/pcarpet name = "Purple Carpet" id = "Purplecarpet" - required_reagents "liquidcarpetp" = 2, "plasticide" = 1) + required_reagents = list("liquidcarpetp" = 2, "plasticide" = 1) carpet_type = /obj/item/stack/tile/carpet/purcarpet /decl/chemical_reaction/instant/carpetify/ocarpet name = "Orange Carpet" id = "orangecarpet" - required_reagents "liquidcarpeto" = 2, "plasticide" = 1) + required_reagents = list("liquidcarpeto" = 2, "plasticide" = 1) carpet_type = /obj/item/stack/tile/carpet/oracarpet From d7c663327b90e0c513dc9c2c21dfe600f5cd2cf2 Mon Sep 17 00:00:00 2001 From: TheObserver-sys Date: Fri, 25 Feb 2022 14:04:40 -0500 Subject: [PATCH 3/3] some fixes for foxes --- code/modules/reagents/reactions/instant/instant.dm | 6 +++--- code/modules/reagents/reagents/other.dm | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/reagents/reactions/instant/instant.dm b/code/modules/reagents/reactions/instant/instant.dm index cd98ca1248e..fdfd0a0df9a 100644 --- a/code/modules/reagents/reactions/instant/instant.dm +++ b/code/modules/reagents/reactions/instant/instant.dm @@ -660,13 +660,13 @@ carpet_type = /obj/item/stack/tile/carpet/blucarpet /decl/chemical_reaction/instant/carpetify/turcarpet - name = "Tur Carpet" + name = "Turquise Carpet" id = "turcarpet" required_reagents = list("liquidcarpettur" = 2, "plasticide" = 1) carpet_type = /obj/item/stack/tile/carpet/turcarpet /decl/chemical_reaction/instant/carpetify/sblucarpet - name = "Sblu Carpet" + name = "Silver Blue Carpet" id = "sblucarpet" required_reagents = list("liquidcarpetsblu" = 2, "plasticide" = 1) carpet_type = /obj/item/stack/tile/carpet/sblucarpet @@ -1140,7 +1140,7 @@ required_reagents = list("liquidcarpet" = 5, "water" = 1) /decl/chemical_reaction/instant/carpetdye/sblu - name = "Deep Blue Carpet Dyeing" + name = "Silver Blue Carpet Dyeing" id = "carpetdyesblu" result = "liquidcarpetsblu" required_reagents = list("liquidcarpet" = 5, "ice" = 1) diff --git a/code/modules/reagents/reagents/other.dm b/code/modules/reagents/reagents/other.dm index abcf581c893..117ed6a2ce9 100644 --- a/code/modules/reagents/reagents/other.dm +++ b/code/modules/reagents/reagents/other.dm @@ -677,7 +677,7 @@ description = "Blue Carpet Fibers, ready for reinforcement." reagent_state = LIQUID color = "#3f4aee" - taste_description = "freezing carpet" + taste_description = "commanding carpet" /datum/reagent/carpet/turquoise name = "Liquid Turquoise Carpet" @@ -688,12 +688,12 @@ taste_description = "water-logged carpet" /datum/reagent/carpet/sblue - name = "Liquid Deep Blue Carpet" + name = "Liquid Silver Blue Carpet" id = "liquidcarpetsblu" - description = "Deep Blue Carpet Fibers, ready for reinforcement." + description = "Silver Blue Carpet Fibers, ready for reinforcement." reagent_state = LIQUID color = "#0011ff" - taste_description = "commanding carpet" + taste_description = "sterile and medicinal carpet" /datum/reagent/carpet/clown name = "Liquid Clown Carpet" @@ -713,7 +713,7 @@ /datum/reagent/carpet/orange name = "Liquid Orange Carpet" - id = "liquidcarpet" + id = "liquidcarpeto" description = "Orange Carpet Fibers, ready for reinforcement." reagent_state = LIQUID color = "#f16e16"