mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 03:33:21 +00:00
Merge pull request #8786 from Meghan-Rossi/lathefix
Fixes duplicate autolathe entries+lets you batch-print carafes+pitchers
This commit is contained in:
@@ -2,45 +2,11 @@
|
|||||||
name = "Holo-collar"
|
name = "Holo-collar"
|
||||||
path =/obj/item/clothing/accessory/collar/holo
|
path =/obj/item/clothing/accessory/collar/holo
|
||||||
|
|
||||||
/datum/category_item/autolathe/general/drinkingglass_square
|
/datum/category_item/autolathe/general/drinkingglass/carafe
|
||||||
is_stack = TRUE
|
|
||||||
|
|
||||||
/datum/category_item/autolathe/general/drinkingglass_rocks
|
|
||||||
is_stack = TRUE
|
|
||||||
|
|
||||||
/datum/category_item/autolathe/general/drinkingglass_shake
|
|
||||||
is_stack = TRUE
|
|
||||||
|
|
||||||
/datum/category_item/autolathe/general/drinkingglass_cocktail
|
|
||||||
is_stack = TRUE
|
|
||||||
|
|
||||||
/datum/category_item/autolathe/general/drinkingglass_shot
|
|
||||||
is_stack = TRUE
|
|
||||||
|
|
||||||
/datum/category_item/autolathe/general/drinkingglass_pint
|
|
||||||
is_stack = TRUE
|
|
||||||
|
|
||||||
/datum/category_item/autolathe/general/drinkingglass_mug
|
|
||||||
is_stack = TRUE
|
|
||||||
|
|
||||||
/datum/category_item/autolathe/general/drinkingglass_wine
|
|
||||||
is_stack = TRUE
|
|
||||||
|
|
||||||
/datum/category_item/autolathe/general/metaglass
|
|
||||||
name = "metamorphic glass"
|
|
||||||
path =/obj/item/weapon/reagent_containers/food/drinks/metaglass
|
|
||||||
is_stack = TRUE
|
|
||||||
|
|
||||||
/datum/category_item/autolathe/general/metaglass_pint
|
|
||||||
name = "metamorphic pint glass"
|
|
||||||
path =/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint
|
|
||||||
is_stack = TRUE
|
|
||||||
|
|
||||||
/datum/category_item/autolathe/general/drinkingglass_carafe
|
|
||||||
name = "glass carafe"
|
name = "glass carafe"
|
||||||
path =/obj/item/weapon/reagent_containers/food/drinks/glass2/carafe
|
path =/obj/item/weapon/reagent_containers/food/drinks/glass2/carafe
|
||||||
|
|
||||||
/datum/category_item/autolathe/general/drinkingglass_pitcher
|
/datum/category_item/autolathe/general/drinkingglass/pitcher
|
||||||
name = "plastic pitcher"
|
name = "plastic pitcher"
|
||||||
path =/obj/item/weapon/reagent_containers/food/drinks/glass2/pitcher
|
path =/obj/item/weapon/reagent_containers/food/drinks/glass2/pitcher
|
||||||
|
|
||||||
Reference in New Issue
Block a user