cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Chemistry-Machinery.dm

Browse Source
This commit is contained in:
Novacat
2020-08-08 23:56:46 -04:00
committed by GitHub
parent afb5819c32
commit 2b45a2613c
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/reagents/Chemistry-Machinery.dm
View File

@@ -663,11 +663,10 @@
return return
options["examine"] = radial_examine options["examine"] = radial_examine
<<<<<<< HEAD
// if there is no power or it's broken, the procs will fail but the buttons will still show // if there is no power or it's broken, the procs will fail but the buttons will still show
if(length(holdingitems)) if(length(holdingitems))
options["grind"] = radial_grind options["grind"] = radial_grind
=======
if (usr.stat != 0) if (usr.stat != 0)
return return
if (!beaker) if (!beaker)
@@ -676,7 +675,6 @@
beaker = null beaker = null
visible_message("<span class='notice'>\The [usr] remove the container from \the [src].</span>") visible_message("<span class='notice'>\The [usr] remove the container from \the [src].</span>")
update_icon() update_icon()
>>>>>>> 864135b... Merge pull request #7425 from lbnesquik/Kot-Cooking-tweak
var/choice var/choice
@@ -844,4 +842,4 @@
#undef MAX_MULTI_AMOUNT #undef MAX_MULTI_AMOUNT
#undef MAX_UNITS_PER_PILL #undef MAX_UNITS_PER_PILL
#undef MAX_UNITS_PER_PATCH #undef MAX_UNITS_PER_PATCH
#undef MAX_CUSTOM_NAME_LEN #undef MAX_CUSTOM_NAME_LEN