cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-29 08:11:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8784 from VOREStation/upstream-merge-7521

Browse Source 
[MIRROR] Adds metamorphic pint glasses to RSF, autolathe, supply packs
This commit is contained in:
Novacat
2020-08-21 01:42:13 -04:00
committed by GitHub
parent 10bcf007c5 1774102ec6
commit 4dc293b831
5 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food/drinkingglass/glass_boxes.dm
+5
View File
@@ -13,6 +13,7 @@
new /obj/item/weapon/reagent_containers/food/drinks/glass2/mug(src)
new /obj/item/weapon/reagent_containers/food/drinks/glass2/wine(src)
new /obj/item/weapon/reagent_containers/food/drinks/metaglass(src)
new /obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint(src)
/obj/item/weapon/storage/box/glasses
name = "box of glasses"
@@ -60,6 +61,10 @@
name = "box of half-pint metamorphic glasses"
glass_type = /obj/item/weapon/reagent_containers/food/drinks/metaglass
/obj/item/weapon/storage/box/glasses/meta/metapint
name = "box of metamorphic pint glasses"
glass_type = /obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint
/obj/item/weapon/storage/box/glass_extras
name = "box of cocktail garnishings"
var/extra_type = /obj/item/weapon/glass_extra