cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 13:39:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev

Browse Source 
Conflicts:
	baystation12.dme
	code/modules/projectiles/ammunition/bullets.dm
This commit is contained in:
Erthilo
2013-09-02 23:32:33 +01:00
parent 33e17c6925 4cb945d921
commit 3b61ba850f
146 changed files with 287 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Machinery.dm
+2 -2
View File
@@ -405,9 +405,9 @@
spawn()
has_sprites += user.client
for(var/i = 1 to MAX_PILL_SPRITE)
usr << browse_rsc(icon('chemical.dmi', "pill" + num2text(i)), "pill[i].png")
usr << browse_rsc(icon('icons/obj/chemical.dmi', "pill" + num2text(i)), "pill[i].png")
for(var/i = 1 to MAX_BOTTLE_SPRITE)
usr << browse_rsc(icon('chemical.dmi', "bottle" + num2text(i)), "bottle[i].png")
usr << browse_rsc(icon('icons/obj/chemical.dmi', "bottle" + num2text(i)), "bottle[i].png")
var/dat = ""
if(!beaker)
dat = "Please insert beaker.<BR>"