cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-02 05:23:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge conflict resolution.

Browse Source
This commit is contained in:
Zuhayr
2014-11-10 13:00:06 +10:30
parent c481bd151d 57110b4059
commit b4ea25d064
42 changed files with 2122 additions and 2046 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,7 @@
if(R.glass_center_of_mass)
center_of_mass = R.glass_center_of_mass
else
center_of_mass = list("x"=16, "y"=10)
center_of_mass = list("x"=16, "y"=10)
else
icon_state = "glass_empty"
name = "glass"