From 237560c8959f4e86dbf872deac91177f133d860a Mon Sep 17 00:00:00 2001 From: BlueWildrose <57083662+BlueWildrose@users.noreply.github.com> Date: Wed, 3 Jul 2024 15:47:41 -0600 Subject: [PATCH] Adds spray bottle & more glasses to autolathe (#6567) ## About The Pull Request - Adds spray bottles to the autolathe. This also means spray bottle scan get recycled. - since various items are being an extension of spray bottle, they also get a base material that could be used for recycling or whatever else. - The metamaterial glass, coffee cup, and fitness cup have also been added to the autolathe. - The costs of making these glasses have been made cheaper to make it consistent with the other glasses available in the lathe. ## Why It's Good For The Game "Hold up, giving people spray bottles seems like a bad idea." So is a chem sprayer, and you can make those in R&D. At minimum, people can fill it with water and make water messes. They can also do that with a fire extinguisher. In order to cause more chaos, they'd need to have access to touch chemicals, which is only likely if you're a security officer, or a job that's in the medical or research department. Which have access to spraying equipment anyways. Anyways, you can just make another spray bottle if someone stole all the spray bottles. Having the capability to make more metaglasses is good otherwise. ## Changelog :cl: add: The spray bottle and a few extra glasses have been added to the autolathe. /:cl: --- .../datums/design/designs/medical/chemistry.dm | 6 ++++++ .../design/designs/misc/drinking_glass.dm | 18 ++++++++++++++++++ code/modules/food/drinkingglass/glass1.dm | 7 ++++--- code/modules/food/drinkingglass/metaglass.dm | 2 +- code/modules/food/drinkingglass/shaker.dm | 2 +- .../reagents/reagent_containers/spray.dm | 17 ++++++++++++----- code/modules/research/designs/weapons.dm | 1 - 7 files changed, 42 insertions(+), 11 deletions(-) diff --git a/code/datums/design/designs/medical/chemistry.dm b/code/datums/design/designs/medical/chemistry.dm index 9a95e95a553..1870c4f3ce2 100644 --- a/code/datums/design/designs/medical/chemistry.dm +++ b/code/datums/design/designs/medical/chemistry.dm @@ -13,6 +13,12 @@ design_unlock = DESIGN_UNLOCK_INTRINSIC build_path = /obj/item/reagent_containers/glass/beaker/large +/datum/design/medical/chemistry/spraybottle + id = "ChemistrySprayBottle" + lathe_type = LATHE_TYPE_AUTOLATHE + design_unlock = DESIGN_UNLOCK_INTRINSIC + build_path = /obj/item/reagent_containers/spray + /datum/design/medical/chemistry/vial id = "ChemistryVial" lathe_type = LATHE_TYPE_AUTOLATHE diff --git a/code/datums/design/designs/misc/drinking_glass.dm b/code/datums/design/designs/misc/drinking_glass.dm index 142412a253a..3ccd5a95dab 100644 --- a/code/datums/design/designs/misc/drinking_glass.dm +++ b/code/datums/design/designs/misc/drinking_glass.dm @@ -61,3 +61,21 @@ lathe_type = LATHE_TYPE_AUTOLATHE design_unlock = DESIGN_UNLOCK_INTRINSIC build_path = /obj/item/reagent_containers/food/drinks/glass2/pitcher + +/datum/design/misc/drink_glass/meta + id = "GlassMeta" + lathe_type = LATHE_TYPE_AUTOLATHE + design_unlock = DESIGN_UNLOCK_INTRINSIC + build_path = /obj/item/reagent_containers/food/drinks/metaglass + +/datum/design/misc/drink_glass/cup + id = "GlassCup" + lathe_type = LATHE_TYPE_AUTOLATHE + design_unlock = DESIGN_UNLOCK_INTRINSIC + build_path = /obj/item/reagent_containers/food/drinks/cup + +/datum/design/misc/drink_glass/fitness + id = "GlassFitness" + lathe_type = LATHE_TYPE_AUTOLATHE + design_unlock = DESIGN_UNLOCK_INTRINSIC + build_path = /obj/item/reagent_containers/food/drinks/glass2/fitnessflask diff --git a/code/modules/food/drinkingglass/glass1.dm b/code/modules/food/drinkingglass/glass1.dm index 631e066dd2b..9a8a1fac185 100644 --- a/code/modules/food/drinkingglass/glass1.dm +++ b/code/modules/food/drinkingglass/glass1.dm @@ -8,7 +8,7 @@ center_of_mass = list("x"=16, "y"=10) drop_sound = 'sound/items/drop/drinkglass.ogg' pickup_sound = 'sound/items/pickup/drinkglass.ogg' - materials_base = list(MAT_GLASS = 500) + materials_base = list(MAT_GLASS = 80) /obj/item/reagent_containers/food/drinks/drinkingglass/on_reagent_change() /*if(reagents.reagent_list.len > 1 ) @@ -59,6 +59,7 @@ amount_per_transfer_from_this = 5 volume = 30 center_of_mass = list("x"=16, "y"=16) + materials_base = list(MAT_GLASS = 60) /obj/item/reagent_containers/food/drinks/cup/on_reagent_change() if (reagents.reagent_list.len > 0) @@ -113,7 +114,7 @@ icon_state = "shotglass" amount_per_transfer_from_this = 10 volume = 10 - materials_base = list(MAT_GLASS = 175) + materials_base = list(MAT_GLASS = 10) /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/on_reagent_change() cut_overlays() @@ -140,7 +141,7 @@ desc = "Big enough to contain enough protein to get perfectly swole. Don't mind the bits." icon_state = "fitness-cup_black" volume = 100 - materials_base = list(MAT_PLASTIC = 2000) + materials_base = list(MAT_PLASTIC = 120) /obj/item/reagent_containers/food/drinks/drinkingglass/fitnessflask/Initialize(mapload) . = ..() diff --git a/code/modules/food/drinkingglass/metaglass.dm b/code/modules/food/drinkingglass/metaglass.dm index 99528e79b00..2ce50b7d500 100644 --- a/code/modules/food/drinkingglass/metaglass.dm +++ b/code/modules/food/drinkingglass/metaglass.dm @@ -6,7 +6,7 @@ volume = 30 integrity_flags = INTEGRITY_ACIDPROOF center_of_mass = list("x"=16, "y"=10) - materials_base = list(MAT_GLASS = 500) + materials_base = list(MAT_GLASS = 80) icon = 'icons/obj/drinks.dmi' /obj/item/reagent_containers/food/drinks/metaglass/on_reagent_change() diff --git a/code/modules/food/drinkingglass/shaker.dm b/code/modules/food/drinkingglass/shaker.dm index 97f6809da67..07d84b802e4 100644 --- a/code/modules/food/drinkingglass/shaker.dm +++ b/code/modules/food/drinkingglass/shaker.dm @@ -5,7 +5,7 @@ icon_state = "fitness-cup_black" base_icon = "fitness-cup" volume = 50 - materials_base = list(MAT_PLASTIC = 2000) + materials_base = list(MAT_PLASTIC = 120) filling_states = list(5,10,15,20,25,30,35,40,45,50) possible_transfer_amounts = list(5, 10, 15, 25) rim_pos = null // no fruit slices diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index da54531817d..173247f04f9 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -16,6 +16,7 @@ var/spray_size = 3 var/list/spray_sizes = list(1,3) volume = 250 + materials_base = list(MAT_GLASS = 1500, MAT_STEEL = 250) /obj/item/reagent_containers/spray/Initialize(mapload) . = ..() @@ -123,10 +124,11 @@ possible_transfer_amounts = null volume = 40 var/safety = TRUE + materials_base = list(MAT_STEEL = 1000) /obj/item/reagent_containers/spray/pepper/Initialize(mapload) . = ..() - reagents.add_reagent("condensedcapsaicin", 40) + reagents.add_reagent("condensedcapsaicin", volume) /obj/item/reagent_containers/spray/pepper/examine(mob/user, dist) . = ..() @@ -153,10 +155,11 @@ volume = 10 drop_sound = 'sound/items/drop/herb.ogg' pickup_sound = 'sound/items/pickup/herb.ogg' + materials_base = list(MAT_PLASTIC = 500) /obj/item/reagent_containers/spray/waterflower/Initialize(mapload) . = ..() - reagents.add_reagent("water", 10) + reagents.add_reagent("water", volume) /obj/item/reagent_containers/spray/chemsprayer name = "chem sprayer" @@ -169,6 +172,7 @@ possible_transfer_amounts = null volume = 600 origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_ENGINEERING = 3) + materials_base = list(MAT_STEEL = 5000, MAT_GLASS = 1000) /obj/item/reagent_containers/spray/chemsprayer/Spray_at(atom/A as mob|obj) var/direction = get_dir(src, A) @@ -198,10 +202,11 @@ icon_state = "plantbgone" item_state = "plantbgone" volume = 100 + materials_base = list(MAT_PLASTIC = 1000) /obj/item/reagent_containers/spray/plantbgone/Initialize(mapload) . = ..() - reagents.add_reagent("plantbgone", 100) + reagents.add_reagent("plantbgone", volume) /obj/item/reagent_containers/spray/pestbgone name = "Pest-B-Gone" @@ -210,10 +215,11 @@ icon_state = "pestbgone" item_state = "pestbgone" volume = 100 + materials_base = list(MAT_PLASTIC = 1000) /obj/item/reagent_containers/spray/pestbgone/Initialize(mapload) . = ..() - reagents.add_reagent("pestbgone", 100) + reagents.add_reagent("pestbgone", volume) /obj/item/reagent_containers/spray/squirt name = "HydroBlaster 4000" @@ -224,10 +230,11 @@ w_class = WEIGHT_CLASS_NORMAL volume = 100 var/pumped = TRUE + materials_base = list(MAT_PLASTIC = 1500) /obj/item/reagent_containers/spray/squirt/Initialize(mapload) . = ..() - reagents.add_reagent("water", 100) + reagents.add_reagent("water", volume) /obj/item/reagent_containers/spray/squirt/examine(mob/user, dist) . = ..() diff --git a/code/modules/research/designs/weapons.dm b/code/modules/research/designs/weapons.dm index 603af916304..dc0a9de724b 100644 --- a/code/modules/research/designs/weapons.dm +++ b/code/modules/research/designs/weapons.dm @@ -286,7 +286,6 @@ desc = "An advanced chem spraying device." id = "chemsprayer" req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 3, TECH_BIO = 2) - materials_base = list(MAT_STEEL = 5000, MAT_GLASS = 1000) build_path = /obj/item/reagent_containers/spray/chemsprayer /datum/design/science/weapon/fuelrod