Bugfix Collection (#11371)

This commit is contained in:
MarinaGryphon
2021-03-04 21:19:10 +01:00
committed by GitHub
parent 8c3ae999ef
commit 2a0ab65e64
20 changed files with 186 additions and 137 deletions
@@ -93,13 +93,11 @@ STOCK_ITEM_UNCOMMON(chempack, 5)
for (var/i in 1 to rand(2, 4))
var/obj/item/reagent_containers/chem_disp_cartridge/C = new /obj/item/reagent_containers/chem_disp_cartridge(L)
var/rname = pick(chems)
var/decl/reagent/R = decls_repository.get_decl(rname)
//If we get a drink, reroll it once.
//Should result in a higher chance of getting medicines and chemicals
if (istype(R, /decl/reagent/drink) || istype(R, /decl/reagent/alcohol))
if (ispath(rname, /decl/reagent/drink) || ispath(rname, /decl/reagent/alcohol))
rname = pick(chems)
R = decls_repository.get_decl(rname)
var/decl/reagent/R = decls_repository.get_decl(rname)
C.reagents.add_reagent(rname, C.volume)
C.setLabel(R.name)