cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-21 19:19:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7521 from Meghan-Rossi/metapint

Browse Source 
Adds metamorphic pint glasses to RSF, autolathe, supply packs
This commit is contained in:
Atermonera
2020-08-21 01:28:23 -04:00
committed by VirgoBot
parent d63f0b2c3e
commit 4a6d87c3a5
5 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/autolathe/general.dm
+19 -8
View File
@@ -6,38 +6,49 @@
name = "water-cooler bottle"
path =/obj/item/weapon/reagent_containers/glass/cooler_bottle
/datum/category_item/autolathe/general/drinkingglass_square
/datum/category_item/autolathe/general/drinkingglass
is_stack = TRUE
/datum/category_item/autolathe/general/drinkingglass/square
name = "half-pint glass"
path =/obj/item/weapon/reagent_containers/food/drinks/glass2/square
/datum/category_item/autolathe/general/drinkingglass_rocks
/datum/category_item/autolathe/general/drinkingglass/rocks
name = "rocks glass"
path =/obj/item/weapon/reagent_containers/food/drinks/glass2/rocks
/datum/category_item/autolathe/general/drinkingglass_shake
/datum/category_item/autolathe/general/drinkingglass/shake
name = "milkshake glass"
path =/obj/item/weapon/reagent_containers/food/drinks/glass2/shake
/datum/category_item/autolathe/general/drinkingglass_cocktail
/datum/category_item/autolathe/general/drinkingglass/cocktail
name = "cocktail glass"
path =/obj/item/weapon/reagent_containers/food/drinks/glass2/cocktail
/datum/category_item/autolathe/general/drinkingglass_shot
/datum/category_item/autolathe/general/drinkingglass/shot
name = "shot glass"
path =/obj/item/weapon/reagent_containers/food/drinks/glass2/shot
/datum/category_item/autolathe/general/drinkingglass_pint
/datum/category_item/autolathe/general/drinkingglass/pint
name = "pint glass"
path =/obj/item/weapon/reagent_containers/food/drinks/glass2/pint
/datum/category_item/autolathe/general/drinkingglass_mug
/datum/category_item/autolathe/general/drinkingglass/mug
name = "glass mug"
path =/obj/item/weapon/reagent_containers/food/drinks/glass2/mug
/datum/category_item/autolathe/general/drinkingglass_wine
/datum/category_item/autolathe/general/drinkingglass/wine
name = "wine glass"
path =/obj/item/weapon/reagent_containers/food/drinks/glass2/wine
/datum/category_item/autolathe/general/drinkingglass/metaglass
name = "metamorphic glass"
path =/obj/item/weapon/reagent_containers/food/drinks/metaglass
/datum/category_item/autolathe/general/drinkingglass/metaglass/metapint
name = "metamorphic pint glass"
path =/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint
/datum/category_item/autolathe/general/flashlight
name = "flashlight"
path =/obj/item/device/flashlight
code/datums/supplypacks/hospitality.dm
+1
View File
@@ -38,6 +38,7 @@
/obj/item/weapon/storage/box/glasses/shot,
/obj/item/weapon/storage/box/glasses/mug,
/obj/item/weapon/storage/box/glasses/meta,
/obj/item/weapon/storage/box/glasses/meta/metapint,
/obj/item/weapon/reagent_containers/food/drinks/shaker,
/obj/item/weapon/storage/box/glass_extras/straws,
/obj/item/weapon/storage/box/glass_extras/sticks