mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-28 15:47:15 +01:00
Merge pull request #27571 from Superhats/chem-mustard
Puts hypovials (and smart darts) back in the ChemMaster
This commit is contained in:
@@ -174,6 +174,8 @@
|
||||
CAT_TUBES = GLOB.reagent_containers[CAT_TUBES],
|
||||
CAT_PILLS = GLOB.reagent_containers[CAT_PILLS],
|
||||
CAT_PATCHES = GLOB.reagent_containers[CAT_PATCHES],
|
||||
CAT_HYPOS = GLOB.reagent_containers[CAT_HYPOS], // SKYRAT EDIT
|
||||
CAT_DARTS = GLOB.reagent_containers[CAT_DARTS], // SKYRAT EDIT
|
||||
)
|
||||
return containers
|
||||
|
||||
@@ -488,6 +490,10 @@
|
||||
item_name_default = "[master_reagent.name] [item_name_default]"
|
||||
if(!(initial(selected_container.reagent_flags) & OPENCONTAINER)) // Closed containers get both reagent name and units in the name
|
||||
item_name_default = "[master_reagent.name] [item_name_default] ([volume_in_each]u)"
|
||||
// SKYRAT EDIT ADDITION START - Autonamed hyposprays/smartdarts
|
||||
if(ispath(selected_container, /obj/item/reagent_containers/cup/vial) || ispath(selected_container, /obj/item/reagent_containers/syringe/smartdart))
|
||||
item_name_default = "[master_reagent.name] [item_name_default]"
|
||||
// SKYRAT EDIT ADDITION END
|
||||
var/item_name = tgui_input_text(usr,
|
||||
"Container name",
|
||||
"Name",
|
||||
|
||||
Reference in New Issue
Block a user