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

Merge upstream PR

Browse Source
This commit is contained in:
Aronai Sieyes
2020-05-26 09:58:33 -04:00
parent f0f70a2b48
commit aede2b3dcd
2 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_dispenser.dm
-11
View File
@@ -365,23 +365,12 @@
return
/obj/structure/reagent_dispensers/water_cooler/update_icon()
/* VOREStation Lazy Fix for Right Now
icon_state = "water_cooler"
overlays.Cut()
var/image/I
if(bottle)
I = image(icon, "water_cooler_bottle")
overlays += I
<<<<<<< HEAD
if(cupholder)
I = image(icon, "water_cooler_cupholder")
overlays += I
if(cups)
I = image(icon, "water_cooler_cups")
overlays += I
*/
=======
>>>>>>> 767ab7b... Merge pull request #7239 from Cerebulon/rotatemapstuff
return
/obj/structure/reagent_dispensers/beerkeg