cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2180 from Yoshax/presentsoffood

Browse Source 
Cargo fixes + Shipping stuff
This commit is contained in:
Neerti
2016-07-23 16:34:24 -04:00
committed by GitHub
parent 4eb5ea7721 167535e0a0
commit d3126ad10b
10 changed files with 91 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/reagents/reagent_containers/drinkingglass/drinkingglass.dm
View File

@@ -25,6 +25,8 @@
possible_transfer_amounts = list(5,10,15,30)
flags = OPENCONTAINER
matter = list("glass" = 60)
/obj/item/weapon/reagent_containers/food/drinks/glass2/examine(mob/M as mob)
..()

8
code/modules/reagents/reagent_containers/drinkingglass/glass_types.dm
View File

@@ -7,6 +7,7 @@
volume = 30
possible_transfer_amounts = list(5,10,15,30)
rim_pos = list(23,13,20) // y, x0, x1
matter = list("glass" = 60)
/obj/item/weapon/reagent_containers/food/drinks/glass2/rocks
name = "rocks glass"
@@ -16,6 +17,7 @@
volume = 20
possible_transfer_amounts = list(5,10,20)
rim_pos = list(21, 10, 23)
matter = list("glass" = 40)
/obj/item/weapon/reagent_containers/food/drinks/glass2/shake
name = "milkshake glass"
@@ -25,6 +27,7 @@
volume = 30
possible_transfer_amounts = list(5,10,15,30)
rim_pos = list(25, 13, 21)
matter = list("glass" = 30)
/obj/item/weapon/reagent_containers/food/drinks/glass2/cocktail
name = "cocktail glass"
@@ -34,6 +37,7 @@
volume = 15
possible_transfer_amounts = list(5,10,15)
rim_pos = list(22, 13, 21)
matter = list("glass" = 30)
/obj/item/weapon/reagent_containers/food/drinks/glass2/shot
name = "shot glass"
@@ -43,6 +47,7 @@
volume = 5
possible_transfer_amounts = list(1,2,5)
rim_pos = list(17, 13, 21)
matter = list("glass" = 10)
/obj/item/weapon/reagent_containers/food/drinks/glass2/pint
name = "pint glass"
@@ -52,6 +57,7 @@
volume = 60
possible_transfer_amounts = list(5,10,15,30,60)
rim_pos = list(25, 12, 21)
matter = list("glass" = 120)
/obj/item/weapon/reagent_containers/food/drinks/glass2/mug
name = "glass mug"
@@ -61,6 +67,7 @@
volume = 40
possible_transfer_amounts = list(5,10,20,40)
rim_pos = list(22, 12, 20)
matter = list("glass" = 80)
/obj/item/weapon/reagent_containers/food/drinks/glass2/wine
name = "wine glass"
@@ -70,3 +77,4 @@
volume = 25
possible_transfer_amounts = list(5, 10, 15, 25)
rim_pos = list(25, 12, 21)
matter = list("glass" = 50)