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

Merge resolution, master into dev.

Browse Source
This commit is contained in:
Zuhayr
2014-08-21 12:01:38 +09:30
parent 0397ce5f1a ec791bd81c
commit b47d91b612
680 changed files with 3896 additions and 3904 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/reagents/reagent_containers/glass.dm
View File

@@ -94,6 +94,7 @@
spawn(5) src.reagents.clear_reagents()
return
else if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us.
target.add_fingerprint(user)
if(!target.reagents.total_volume && target.reagents)
user << "\red [target] is empty."