cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-28 14:36:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-24

Browse Source 
# Conflicts:
#	maps/southern_cross/southern_cross-1.dmm
This commit is contained in:
Leshana
2018-02-24 13:19:10 -05:00
parent a43acad170 74a4e993ee
commit 4ebbf1ce7a
28 changed files with 311122 additions and 11355 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/food/drinks/bottle.dm
+9
View File
@@ -540,3 +540,12 @@
/obj/item/weapon/reagent_containers/food/drinks/bottle/sake/New()
..()
reagents.add_reagent("sake", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/champagne
name = "Gilthari Luxury Champagne"
desc = "For those special occassions."
icon_state = "champagne"
/obj/item/weapon/reagent_containers/food/drinks/bottle/champagne/New()
..()
reagents.add_reagent("champagne", 100)