cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 23:58:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9328 from Xhuis/autolatheItemFix

Browse Source 
Fixes autolathe accepting borg modules
This commit is contained in:
Cheridan
2015-05-11 09:40:35 -05:00
parent 31b4d60d98 0b446674a0
commit 67bfcfbc1d
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/autolathe.dm
+7 -4
View File
@@ -118,13 +118,16 @@
return 1
if (src.m_amount + O.m_amt > max_m_amount)
user << "<span class=\"alert\">The autolathe is full. Please remove metal from the autolathe in order to insert more.</span>"
user << "<span class='warning'>The autolathe is full. Please remove metal from the autolathe in order to insert more.</span>"
return 1
if (src.g_amount + O.g_amt > max_g_amount)
user << "<span class=\"alert\">The autolathe is full. Please remove glass from the autolathe in order to insert more.</span>"
user << "<span class='warning'>The autolathe is full. Please remove glass from the autolathe in order to insert more.</span>"
return 1
if (O.m_amt == 0 && O.g_amt == 0)
user << "<span class=\"alert\">This object does not contain significant amounts of metal or glass, or cannot be accepted by the autolathe due to size or hazardous materials.</span>"
if (!O.m_amt && !O.g_amt)
user << "<span class='warning'>This object does not contain sufficient amounts of metal or glass to be accepted by the autolathe.</span>"
return 1
if(!user.unEquip(O))
user << "<span class='warning'>\The [O] is stuck to you and cannot be placed into the autolathe.</span>"
return 1
var/amount = 1