cyberpresidentvanellope/YWPolarisVore
1
0
Fork 0
mirror of https://github.com/Yawn-Wider/YWPolarisVore.git synced 2026-08-21 20:18:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev-freeze

Browse Source 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/alarm.dm
This commit is contained in:
Mloc-Argent
2014-06-30 23:44:46 +01:00
parent 1bc57b81a3 8724779dbf
commit 6630e4838e
13 changed files with 1748 additions and 1770 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/food/drinks.dm
+2 -2
View File
@@ -219,7 +219,7 @@
..()
reagents.add_reagent("tea", 30)
src.pixel_x = rand(-10.0, 10)
src.pixel_y = rand(-10.0, 10)
src.pixel_y = rand(0, 20) // the teacup is very low on the 32x32 grid so if it's -y then it clips into the tile below it.
/obj/item/weapon/reagent_containers/food/drinks/ice
name = "Ice Cup"
@@ -310,4 +310,4 @@
name = "cup"
desc = "A cup with the British flag emblazoned on it."
icon_state = "britcup"
volume = 30
volume = 30