cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cyborg' into 'Bleeding-Edge'

Browse Source 
Fix feeding tools to autolathe

If it works for storage containers it works here, also I made that fix too long ago.
Fixes #108

See merge request !143
This commit is contained in:
Rob Nelson
2015-08-26 07:20:38 +00:00
parent 367a0d657c 7a847c883f
commit 72aa2cb1a6
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/game/machinery/autolathe.dm
View File

@@ -155,12 +155,21 @@
if(I.materials.getVolume() + src.materials.getVolume() > max_material_storage)
user << "\The [src]'s material bin is too full to recycle \the [I]."
return 1
if(I.materials.getAmount(MAT_IRON) + I.materials.getAmount(MAT_GLASS) < I.materials.getVolume())
else if(I.materials.getAmount(MAT_IRON) + I.materials.getAmount(MAT_GLASS) < I.materials.getVolume())
user << "\The [src] can only accept objects made out of metal and glass."
return 1
else if(isrobot(user))
if(isMoMMI(user))
var/mob/living/silicon/robot/mommi/M = user
if(M.is_in_modules(I))
user << "You cannot recycle your built in tools."
return 1
else
user << "You cannot recycle your built in tools."
return 1
user.drop_item(I, src)
materials.removeFrom(I.materials)
user.visible_message("[user] puts \the [I] into \the [src]'s recycling unit.",
"You put \the [I] in \the [src]'s reycling unit.")
qdel(I)
return 1
return 1