Merge branch 'master' into final_shuttle_touches_and_stuff

# Conflicts:
#	code/modules/power/breaker_box.dm
This commit is contained in:
alberyk
2022-01-17 19:36:22 -03:00
54 changed files with 407 additions and 181 deletions
@@ -256,6 +256,13 @@
can_tamper = FALSE
reagents_to_add = list(/decl/reagent/acid = 1000)
/obj/structure/reagent_dispensers/peppertank/luminol
name = "luminol dispenser"
desc = "A dispenser to refill luminol bottles."
icon_state = "luminoltank"
amount_per_transfer_from_this = 50
reagents_to_add = list(/decl/reagent/luminol = 1000)
//Water Cooler
/obj/structure/reagent_dispensers/water_cooler