Skip to content

Commit

Permalink
Adds spray bottle & more glasses to autolathe (#6567)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## 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

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
add: The spray bottle and a few extra glasses have been added to the
autolathe.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
BlueWildrose committed Jul 3, 2024
1 parent f19546c commit 237560c
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 11 deletions.
6 changes: 6 additions & 0 deletions code/datums/design/designs/medical/chemistry.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 18 additions & 0 deletions code/datums/design/designs/misc/drinking_glass.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 4 additions & 3 deletions code/modules/food/drinkingglass/glass1.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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()
Expand All @@ -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)
. = ..()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/food/drinkingglass/metaglass.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/food/drinkingglass/shaker.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 12 additions & 5 deletions code/modules/reagents/reagent_containers/spray.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
. = ..()
Expand Down Expand Up @@ -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)
. = ..()
Expand All @@ -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"
Expand All @@ -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)
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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)
. = ..()
Expand Down
1 change: 0 additions & 1 deletion code/modules/research/designs/weapons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 237560c

Please sign in to comment.